diff --git a/djhk-admin/target/classes/com/djhk/DjhkApplication.class b/djhk-admin/target/classes/com/djhk/DjhkApplication.class
index 1d16397..a0952da 100644
Binary files a/djhk-admin/target/classes/com/djhk/DjhkApplication.class and b/djhk-admin/target/classes/com/djhk/DjhkApplication.class differ
diff --git a/djhk-admin/target/classes/com/djhk/DjhkServletInitializer.class b/djhk-admin/target/classes/com/djhk/DjhkServletInitializer.class
index 21b8d0e..0c3a2be 100644
Binary files a/djhk-admin/target/classes/com/djhk/DjhkServletInitializer.class and b/djhk-admin/target/classes/com/djhk/DjhkServletInitializer.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/common/CaptchaController.class b/djhk-admin/target/classes/com/djhk/web/controller/common/CaptchaController.class
index b6403a8..05a60a8 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/common/CaptchaController.class and b/djhk-admin/target/classes/com/djhk/web/controller/common/CaptchaController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/common/CommonController.class b/djhk-admin/target/classes/com/djhk/web/controller/common/CommonController.class
index f72ae6f..527cc0e 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/common/CommonController.class and b/djhk-admin/target/classes/com/djhk/web/controller/common/CommonController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/monitor/CacheController.class b/djhk-admin/target/classes/com/djhk/web/controller/monitor/CacheController.class
index f74b9fe..85dc9d2 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/monitor/CacheController.class and b/djhk-admin/target/classes/com/djhk/web/controller/monitor/CacheController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/monitor/ServerController.class b/djhk-admin/target/classes/com/djhk/web/controller/monitor/ServerController.class
index e0212d7..0db3be3 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/monitor/ServerController.class and b/djhk-admin/target/classes/com/djhk/web/controller/monitor/ServerController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysLogininforController.class b/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysLogininforController.class
index 525bc65..aa0e3f2 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysLogininforController.class and b/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysLogininforController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysOperlogController.class b/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysOperlogController.class
index 9dd8123..5aac27c 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysOperlogController.class and b/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysOperlogController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysUserOnlineController.class b/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysUserOnlineController.class
index 32168fe..9f3aa4a 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysUserOnlineController.class and b/djhk-admin/target/classes/com/djhk/web/controller/monitor/SysUserOnlineController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysConfigController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysConfigController.class
index d7e3761..b7e007f 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysConfigController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysConfigController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysDeptController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysDeptController.class
index 9b9f056..bf08c81 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysDeptController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysDeptController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictDataController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictDataController.class
index 6cb2cdf..331ebbc 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictDataController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictDataController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictTypeController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictTypeController.class
index dacef4e..752f883 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictTypeController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysDictTypeController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysIndexController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysIndexController.class
index 80ad0ea..bfebb42 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysIndexController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysIndexController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysLoginController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysLoginController.class
index 04007b1..462d4a8 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysLoginController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysLoginController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysMenuController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysMenuController.class
index be9915f..d73eea4 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysMenuController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysMenuController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysNoticeController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysNoticeController.class
index 4965dc7..907f7a0 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysNoticeController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysNoticeController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysPostController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysPostController.class
index afd4b48..ae5fd23 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysPostController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysPostController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysProfileController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysProfileController.class
index 0b47101..8240eff 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysProfileController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysProfileController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysRegisterController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysRegisterController.class
index cea91a1..b7f1f5e 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysRegisterController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysRegisterController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysRoleController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysRoleController.class
index bd78092..7e3e7f8 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysRoleController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysRoleController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/system/SysUserController.class b/djhk-admin/target/classes/com/djhk/web/controller/system/SysUserController.class
index c8349e3..157b935 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/system/SysUserController.class and b/djhk-admin/target/classes/com/djhk/web/controller/system/SysUserController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/tool/TestController.class b/djhk-admin/target/classes/com/djhk/web/controller/tool/TestController.class
index 2f6862d..67ec287 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/tool/TestController.class and b/djhk-admin/target/classes/com/djhk/web/controller/tool/TestController.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/controller/tool/UserEntity.class b/djhk-admin/target/classes/com/djhk/web/controller/tool/UserEntity.class
index 92c5305..5f4d1ac 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/controller/tool/UserEntity.class and b/djhk-admin/target/classes/com/djhk/web/controller/tool/UserEntity.class differ
diff --git a/djhk-admin/target/classes/com/djhk/web/core/config/SwaggerConfig.class b/djhk-admin/target/classes/com/djhk/web/core/config/SwaggerConfig.class
index 473d9ab..bfe74d6 100644
Binary files a/djhk-admin/target/classes/com/djhk/web/core/config/SwaggerConfig.class and b/djhk-admin/target/classes/com/djhk/web/core/config/SwaggerConfig.class differ
diff --git a/djhk-common/pom.xml b/djhk-common/pom.xml
index 855166a..40d41a0 100644
--- a/djhk-common/pom.xml
+++ b/djhk-common/pom.xml
@@ -35,6 +35,11 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+
         <!-- pagehelper 分页插件 -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
diff --git a/djhk-common/src/main/java/com/djhk/common/utils/DictUtils.java b/djhk-common/src/main/java/com/djhk/common/utils/DictUtils.java
index 91fb12d..87a9d29 100644
--- a/djhk-common/src/main/java/com/djhk/common/utils/DictUtils.java
+++ b/djhk-common/src/main/java/com/djhk/common/utils/DictUtils.java
@@ -207,6 +207,20 @@ public class DictUtils
         return StringUtils.stripEnd(propertyString.toString(), SEPARATOR);
     }
 
+
+    /**
+     * 根据字典类型获取字典所有标签
+     *
+     * @param dictType 字典类型
+     * @return 字典值
+     */
+    public static List<SysDictData> getDictDataByType(String dictType)
+    {
+        StringBuilder propertyString = new StringBuilder();
+        List<SysDictData> datas = getDictCache(dictType);
+        return datas;
+    }
+
     /**
      * 删除指定字典缓存
      * 
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/Anonymous.class b/djhk-common/target/classes/com/djhk/common/annotation/Anonymous.class
index c6c6d13..8dc58ac 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/Anonymous.class and b/djhk-common/target/classes/com/djhk/common/annotation/Anonymous.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/DataScope.class b/djhk-common/target/classes/com/djhk/common/annotation/DataScope.class
index e166690..8f7da05 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/DataScope.class and b/djhk-common/target/classes/com/djhk/common/annotation/DataScope.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/DataSource.class b/djhk-common/target/classes/com/djhk/common/annotation/DataSource.class
index a787c69..333e913 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/DataSource.class and b/djhk-common/target/classes/com/djhk/common/annotation/DataSource.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/Excel$ColumnType.class b/djhk-common/target/classes/com/djhk/common/annotation/Excel$ColumnType.class
index f44b90d..1653fef 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/Excel$ColumnType.class and b/djhk-common/target/classes/com/djhk/common/annotation/Excel$ColumnType.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/Excel$Type.class b/djhk-common/target/classes/com/djhk/common/annotation/Excel$Type.class
index 2f5c3aa..f535358 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/Excel$Type.class and b/djhk-common/target/classes/com/djhk/common/annotation/Excel$Type.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/Excel.class b/djhk-common/target/classes/com/djhk/common/annotation/Excel.class
index 5b8e17a..ebd6fb5 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/Excel.class and b/djhk-common/target/classes/com/djhk/common/annotation/Excel.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/Excels.class b/djhk-common/target/classes/com/djhk/common/annotation/Excels.class
index ac36c66..00b3b3f 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/Excels.class and b/djhk-common/target/classes/com/djhk/common/annotation/Excels.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/Log.class b/djhk-common/target/classes/com/djhk/common/annotation/Log.class
index bf03a6b..3411169 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/Log.class and b/djhk-common/target/classes/com/djhk/common/annotation/Log.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/RateLimiter.class b/djhk-common/target/classes/com/djhk/common/annotation/RateLimiter.class
index f7db9ff..c3ab478 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/RateLimiter.class and b/djhk-common/target/classes/com/djhk/common/annotation/RateLimiter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/RepeatSubmit.class b/djhk-common/target/classes/com/djhk/common/annotation/RepeatSubmit.class
index 16ca229..4e3defb 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/RepeatSubmit.class and b/djhk-common/target/classes/com/djhk/common/annotation/RepeatSubmit.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/annotation/Sensitive.class b/djhk-common/target/classes/com/djhk/common/annotation/Sensitive.class
index d321d70..9eaaaf8 100644
Binary files a/djhk-common/target/classes/com/djhk/common/annotation/Sensitive.class and b/djhk-common/target/classes/com/djhk/common/annotation/Sensitive.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/config/DjhkConfig.class b/djhk-common/target/classes/com/djhk/common/config/DjhkConfig.class
index 8078620..7f98917 100644
Binary files a/djhk-common/target/classes/com/djhk/common/config/DjhkConfig.class and b/djhk-common/target/classes/com/djhk/common/config/DjhkConfig.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/config/serializer/SensitiveJsonSerializer.class b/djhk-common/target/classes/com/djhk/common/config/serializer/SensitiveJsonSerializer.class
index 14d332c..7a0de7d 100644
Binary files a/djhk-common/target/classes/com/djhk/common/config/serializer/SensitiveJsonSerializer.class and b/djhk-common/target/classes/com/djhk/common/config/serializer/SensitiveJsonSerializer.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/constant/CacheConstants.class b/djhk-common/target/classes/com/djhk/common/constant/CacheConstants.class
index f03d27a..1cce8a3 100644
Binary files a/djhk-common/target/classes/com/djhk/common/constant/CacheConstants.class and b/djhk-common/target/classes/com/djhk/common/constant/CacheConstants.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/constant/Constants.class b/djhk-common/target/classes/com/djhk/common/constant/Constants.class
index be6d242..39efaa2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/constant/Constants.class and b/djhk-common/target/classes/com/djhk/common/constant/Constants.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/constant/GenConstants.class b/djhk-common/target/classes/com/djhk/common/constant/GenConstants.class
index bd325de..93f19c1 100644
Binary files a/djhk-common/target/classes/com/djhk/common/constant/GenConstants.class and b/djhk-common/target/classes/com/djhk/common/constant/GenConstants.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/constant/HttpStatus.class b/djhk-common/target/classes/com/djhk/common/constant/HttpStatus.class
index 01f5ce7..a2523de 100644
Binary files a/djhk-common/target/classes/com/djhk/common/constant/HttpStatus.class and b/djhk-common/target/classes/com/djhk/common/constant/HttpStatus.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants$Status.class b/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants$Status.class
index 9c6852e..c989364 100644
Binary files a/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants$Status.class and b/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants$Status.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants.class b/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants.class
index ed9d0ad..87fbaf8 100644
Binary files a/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants.class and b/djhk-common/target/classes/com/djhk/common/constant/ScheduleConstants.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/constant/UserConstants.class b/djhk-common/target/classes/com/djhk/common/constant/UserConstants.class
index 7b18f40..e393e4f 100644
Binary files a/djhk-common/target/classes/com/djhk/common/constant/UserConstants.class and b/djhk-common/target/classes/com/djhk/common/constant/UserConstants.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/controller/BaseController$1.class b/djhk-common/target/classes/com/djhk/common/core/controller/BaseController$1.class
index f9a1fd3..0b71cb6 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/controller/BaseController$1.class and b/djhk-common/target/classes/com/djhk/common/core/controller/BaseController$1.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/controller/BaseController.class b/djhk-common/target/classes/com/djhk/common/core/controller/BaseController.class
index a13213e..ccd221d 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/controller/BaseController.class and b/djhk-common/target/classes/com/djhk/common/core/controller/BaseController.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/AjaxResult.class b/djhk-common/target/classes/com/djhk/common/core/domain/AjaxResult.class
index f4b3599..7a24417 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/AjaxResult.class and b/djhk-common/target/classes/com/djhk/common/core/domain/AjaxResult.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/BaseEntity.class b/djhk-common/target/classes/com/djhk/common/core/domain/BaseEntity.class
index 5cdf26c..d6c8c2a 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/BaseEntity.class and b/djhk-common/target/classes/com/djhk/common/core/domain/BaseEntity.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/R.class b/djhk-common/target/classes/com/djhk/common/core/domain/R.class
index 6b23a31..6d74ed9 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/R.class and b/djhk-common/target/classes/com/djhk/common/core/domain/R.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/TreeEntity.class b/djhk-common/target/classes/com/djhk/common/core/domain/TreeEntity.class
index 591678c..305fee3 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/TreeEntity.class and b/djhk-common/target/classes/com/djhk/common/core/domain/TreeEntity.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/TreeSelect.class b/djhk-common/target/classes/com/djhk/common/core/domain/TreeSelect.class
index b44b363..376e204 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/TreeSelect.class and b/djhk-common/target/classes/com/djhk/common/core/domain/TreeSelect.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDept.class b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDept.class
index 7a3599d..5ffffd2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDept.class and b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDept.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictData.class b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictData.class
index 7afae31..7e6ff1f 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictData.class and b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictData.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictType.class b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictType.class
index 0826a4a..d6ad1d4 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictType.class and b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysDictType.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysMenu.class b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysMenu.class
index b90737d..32e0e2b 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysMenu.class and b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysMenu.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysRole.class b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysRole.class
index d2038b4..ccd509b 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysRole.class and b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysRole.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysUser.class b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysUser.class
index ec96209..d16f6f3 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysUser.class and b/djhk-common/target/classes/com/djhk/common/core/domain/entity/SysUser.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginBody.class b/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginBody.class
index 33e0128..1c558ea 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginBody.class and b/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginBody.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginUser.class b/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginUser.class
index 96c887b..23234b6 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginUser.class and b/djhk-common/target/classes/com/djhk/common/core/domain/model/LoginUser.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/domain/model/RegisterBody.class b/djhk-common/target/classes/com/djhk/common/core/domain/model/RegisterBody.class
index 5ebaa80..dd887e2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/domain/model/RegisterBody.class and b/djhk-common/target/classes/com/djhk/common/core/domain/model/RegisterBody.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/page/PageDomain.class b/djhk-common/target/classes/com/djhk/common/core/page/PageDomain.class
index 5c730ba..f9c3bcf 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/page/PageDomain.class and b/djhk-common/target/classes/com/djhk/common/core/page/PageDomain.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/page/TableDataInfo.class b/djhk-common/target/classes/com/djhk/common/core/page/TableDataInfo.class
index 430e088..3c0d0e5 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/page/TableDataInfo.class and b/djhk-common/target/classes/com/djhk/common/core/page/TableDataInfo.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/page/TableSupport.class b/djhk-common/target/classes/com/djhk/common/core/page/TableSupport.class
index 5fab89b..769ff18 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/page/TableSupport.class and b/djhk-common/target/classes/com/djhk/common/core/page/TableSupport.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/redis/RedisCache.class b/djhk-common/target/classes/com/djhk/common/core/redis/RedisCache.class
index 194554e..12a0541 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/redis/RedisCache.class and b/djhk-common/target/classes/com/djhk/common/core/redis/RedisCache.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/text/CharsetKit.class b/djhk-common/target/classes/com/djhk/common/core/text/CharsetKit.class
index e837c69..dd0134e 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/text/CharsetKit.class and b/djhk-common/target/classes/com/djhk/common/core/text/CharsetKit.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/text/Convert.class b/djhk-common/target/classes/com/djhk/common/core/text/Convert.class
index 63b6633..261b349 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/text/Convert.class and b/djhk-common/target/classes/com/djhk/common/core/text/Convert.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/core/text/StrFormatter.class b/djhk-common/target/classes/com/djhk/common/core/text/StrFormatter.class
index 6f98422..e022a2d 100644
Binary files a/djhk-common/target/classes/com/djhk/common/core/text/StrFormatter.class and b/djhk-common/target/classes/com/djhk/common/core/text/StrFormatter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/BusinessStatus.class b/djhk-common/target/classes/com/djhk/common/enums/BusinessStatus.class
index 4e12871..e49aeb6 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/BusinessStatus.class and b/djhk-common/target/classes/com/djhk/common/enums/BusinessStatus.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/BusinessType.class b/djhk-common/target/classes/com/djhk/common/enums/BusinessType.class
index b902e56..ee226fd 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/BusinessType.class and b/djhk-common/target/classes/com/djhk/common/enums/BusinessType.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/DataSourceType.class b/djhk-common/target/classes/com/djhk/common/enums/DataSourceType.class
index 64b8962..21d3868 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/DataSourceType.class and b/djhk-common/target/classes/com/djhk/common/enums/DataSourceType.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/DesensitizedType.class b/djhk-common/target/classes/com/djhk/common/enums/DesensitizedType.class
index 965ff12..14557e0 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/DesensitizedType.class and b/djhk-common/target/classes/com/djhk/common/enums/DesensitizedType.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/HttpMethod.class b/djhk-common/target/classes/com/djhk/common/enums/HttpMethod.class
index c529490..2db86af 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/HttpMethod.class and b/djhk-common/target/classes/com/djhk/common/enums/HttpMethod.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/LimitType.class b/djhk-common/target/classes/com/djhk/common/enums/LimitType.class
index e97bc0a..40cb9d3 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/LimitType.class and b/djhk-common/target/classes/com/djhk/common/enums/LimitType.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/OperatorType.class b/djhk-common/target/classes/com/djhk/common/enums/OperatorType.class
index 8d1b52f..00ff74b 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/OperatorType.class and b/djhk-common/target/classes/com/djhk/common/enums/OperatorType.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/enums/UserStatus.class b/djhk-common/target/classes/com/djhk/common/enums/UserStatus.class
index 3bfdb7d..6e50188 100644
Binary files a/djhk-common/target/classes/com/djhk/common/enums/UserStatus.class and b/djhk-common/target/classes/com/djhk/common/enums/UserStatus.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/DemoModeException.class b/djhk-common/target/classes/com/djhk/common/exception/DemoModeException.class
index 749a25f..768551c 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/DemoModeException.class and b/djhk-common/target/classes/com/djhk/common/exception/DemoModeException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/GlobalException.class b/djhk-common/target/classes/com/djhk/common/exception/GlobalException.class
index ce0bd9c..8b4a75c 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/GlobalException.class and b/djhk-common/target/classes/com/djhk/common/exception/GlobalException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/ServiceException.class b/djhk-common/target/classes/com/djhk/common/exception/ServiceException.class
index 8e0b4ae..27e0d99 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/ServiceException.class and b/djhk-common/target/classes/com/djhk/common/exception/ServiceException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/UtilException.class b/djhk-common/target/classes/com/djhk/common/exception/UtilException.class
index 2f88a78..ad9c560 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/UtilException.class and b/djhk-common/target/classes/com/djhk/common/exception/UtilException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/base/BaseException.class b/djhk-common/target/classes/com/djhk/common/exception/base/BaseException.class
index 801da4d..c057eb3 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/base/BaseException.class and b/djhk-common/target/classes/com/djhk/common/exception/base/BaseException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/FileException.class b/djhk-common/target/classes/com/djhk/common/exception/file/FileException.class
index 977c601..831483b 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/FileException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/FileException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/FileNameLengthLimitExceededException.class b/djhk-common/target/classes/com/djhk/common/exception/file/FileNameLengthLimitExceededException.class
index 0dfe201..c64dd39 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/FileNameLengthLimitExceededException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/FileNameLengthLimitExceededException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/FileSizeLimitExceededException.class b/djhk-common/target/classes/com/djhk/common/exception/file/FileSizeLimitExceededException.class
index d9dd957..6865282 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/FileSizeLimitExceededException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/FileSizeLimitExceededException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/FileUploadException.class b/djhk-common/target/classes/com/djhk/common/exception/file/FileUploadException.class
index a214443..425eabf 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/FileUploadException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/FileUploadException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class
index dd3a0fa..79c823a 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidFlashExtensionException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class
index f1a4447..5702716 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidImageExtensionException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class
index a080b74..51d1afe 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidMediaExtensionException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class
index cb669a4..faf7c0e 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException$InvalidVideoExtensionException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException.class b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException.class
index f80ec62..5cd8a9d 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException.class and b/djhk-common/target/classes/com/djhk/common/exception/file/InvalidExtensionException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/job/TaskException$Code.class b/djhk-common/target/classes/com/djhk/common/exception/job/TaskException$Code.class
index 22e846d..a4e91d6 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/job/TaskException$Code.class and b/djhk-common/target/classes/com/djhk/common/exception/job/TaskException$Code.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/job/TaskException.class b/djhk-common/target/classes/com/djhk/common/exception/job/TaskException.class
index b9bc253..532ccd2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/job/TaskException.class and b/djhk-common/target/classes/com/djhk/common/exception/job/TaskException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/user/BlackListException.class b/djhk-common/target/classes/com/djhk/common/exception/user/BlackListException.class
index 7915df7..f0b9d34 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/user/BlackListException.class and b/djhk-common/target/classes/com/djhk/common/exception/user/BlackListException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaException.class b/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaException.class
index 9b82139..b615803 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaException.class and b/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaExpireException.class b/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaExpireException.class
index ac70b89..fda8ca9 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaExpireException.class and b/djhk-common/target/classes/com/djhk/common/exception/user/CaptchaExpireException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/user/UserException.class b/djhk-common/target/classes/com/djhk/common/exception/user/UserException.class
index 7dbaa64..47f4bef 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/user/UserException.class and b/djhk-common/target/classes/com/djhk/common/exception/user/UserException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/user/UserNotExistsException.class b/djhk-common/target/classes/com/djhk/common/exception/user/UserNotExistsException.class
index 22d4168..fb2eebc 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/user/UserNotExistsException.class and b/djhk-common/target/classes/com/djhk/common/exception/user/UserNotExistsException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordNotMatchException.class b/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordNotMatchException.class
index 342f805..1bba115 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordNotMatchException.class and b/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordNotMatchException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordRetryLimitExceedException.class b/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordRetryLimitExceedException.class
index 9c58182..e8a1f06 100644
Binary files a/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordRetryLimitExceedException.class and b/djhk-common/target/classes/com/djhk/common/exception/user/UserPasswordRetryLimitExceedException.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/PropertyPreExcludeFilter.class b/djhk-common/target/classes/com/djhk/common/filter/PropertyPreExcludeFilter.class
index 2654534..058bdd2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/PropertyPreExcludeFilter.class and b/djhk-common/target/classes/com/djhk/common/filter/PropertyPreExcludeFilter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/RefererFilter.class b/djhk-common/target/classes/com/djhk/common/filter/RefererFilter.class
index d3e5e62..ddb6bad 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/RefererFilter.class and b/djhk-common/target/classes/com/djhk/common/filter/RefererFilter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/RepeatableFilter.class b/djhk-common/target/classes/com/djhk/common/filter/RepeatableFilter.class
index de783d3..965ec8a 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/RepeatableFilter.class and b/djhk-common/target/classes/com/djhk/common/filter/RepeatableFilter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper$1.class b/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper$1.class
index 4555cd9..8b4aef1 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper$1.class and b/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper$1.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper.class b/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper.class
index b586222..767fd86 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper.class and b/djhk-common/target/classes/com/djhk/common/filter/RepeatedlyRequestWrapper.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/XssFilter.class b/djhk-common/target/classes/com/djhk/common/filter/XssFilter.class
index eee86e5..f45944a 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/XssFilter.class and b/djhk-common/target/classes/com/djhk/common/filter/XssFilter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper$1.class b/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper$1.class
index dabf978..1393cf9 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper$1.class and b/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper$1.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper.class b/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper.class
index fec7cab..ac2c331 100644
Binary files a/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper.class and b/djhk-common/target/classes/com/djhk/common/filter/XssHttpServletRequestWrapper.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/Arith.class b/djhk-common/target/classes/com/djhk/common/utils/Arith.class
index 5b515c2..6483253 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/Arith.class and b/djhk-common/target/classes/com/djhk/common/utils/Arith.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/DateUtils.class b/djhk-common/target/classes/com/djhk/common/utils/DateUtils.class
index ddf60d9..49c2979 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/DateUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/DateUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/DesensitizedUtil.class b/djhk-common/target/classes/com/djhk/common/utils/DesensitizedUtil.class
index 2ccdd8e..342b2e0 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/DesensitizedUtil.class and b/djhk-common/target/classes/com/djhk/common/utils/DesensitizedUtil.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/DictUtils.class b/djhk-common/target/classes/com/djhk/common/utils/DictUtils.class
index 8560cd0..f198013 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/DictUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/DictUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/ExceptionUtil.class b/djhk-common/target/classes/com/djhk/common/utils/ExceptionUtil.class
index e4598fd..8586c72 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/ExceptionUtil.class and b/djhk-common/target/classes/com/djhk/common/utils/ExceptionUtil.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/LogUtils.class b/djhk-common/target/classes/com/djhk/common/utils/LogUtils.class
index 9adb5a3..53586af 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/LogUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/LogUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/MessageUtils.class b/djhk-common/target/classes/com/djhk/common/utils/MessageUtils.class
index 3f3dade..545c100 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/MessageUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/MessageUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/PageUtils.class b/djhk-common/target/classes/com/djhk/common/utils/PageUtils.class
index eb4f709..b0ea14e 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/PageUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/PageUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/SecurityUtils.class b/djhk-common/target/classes/com/djhk/common/utils/SecurityUtils.class
index 70159ad..5ff7984 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/SecurityUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/SecurityUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/ServletUtils.class b/djhk-common/target/classes/com/djhk/common/utils/ServletUtils.class
index f14ab4e..faacff3 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/ServletUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/ServletUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/StringUtils.class b/djhk-common/target/classes/com/djhk/common/utils/StringUtils.class
index 0a7d3fd..ae330eb 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/StringUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/StringUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/Threads.class b/djhk-common/target/classes/com/djhk/common/utils/Threads.class
index 830d5ba..5083fd3 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/Threads.class and b/djhk-common/target/classes/com/djhk/common/utils/Threads.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/bean/BeanUtils.class b/djhk-common/target/classes/com/djhk/common/utils/bean/BeanUtils.class
index 9cf509c..a3f5ac2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/bean/BeanUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/bean/BeanUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/bean/BeanValidators.class b/djhk-common/target/classes/com/djhk/common/utils/bean/BeanValidators.class
index 82be7f0..f3cbf3f 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/bean/BeanValidators.class and b/djhk-common/target/classes/com/djhk/common/utils/bean/BeanValidators.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/file/FileTypeUtils.class b/djhk-common/target/classes/com/djhk/common/utils/file/FileTypeUtils.class
index 6283c29..574b039 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/file/FileTypeUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/file/FileTypeUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/file/FileUploadUtils.class b/djhk-common/target/classes/com/djhk/common/utils/file/FileUploadUtils.class
index 55b7e5a..afae91e 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/file/FileUploadUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/file/FileUploadUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/file/FileUtils.class b/djhk-common/target/classes/com/djhk/common/utils/file/FileUtils.class
index 9e54379..7c4aef9 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/file/FileUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/file/FileUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/file/ImageUtils.class b/djhk-common/target/classes/com/djhk/common/utils/file/ImageUtils.class
index e0816b0..dd0972b 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/file/ImageUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/file/ImageUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/file/MimeTypeUtils.class b/djhk-common/target/classes/com/djhk/common/utils/file/MimeTypeUtils.class
index fe068ab..c8dea7f 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/file/MimeTypeUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/file/MimeTypeUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/html/EscapeUtil.class b/djhk-common/target/classes/com/djhk/common/utils/html/EscapeUtil.class
index 035ae67..5f0272b 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/html/EscapeUtil.class and b/djhk-common/target/classes/com/djhk/common/utils/html/EscapeUtil.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/html/HTMLFilter.class b/djhk-common/target/classes/com/djhk/common/utils/html/HTMLFilter.class
index 9ffad64..d4cb312 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/html/HTMLFilter.class and b/djhk-common/target/classes/com/djhk/common/utils/html/HTMLFilter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/http/HttpHelper.class b/djhk-common/target/classes/com/djhk/common/utils/http/HttpHelper.class
index 5108887..4ca6c42 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/http/HttpHelper.class and b/djhk-common/target/classes/com/djhk/common/utils/http/HttpHelper.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$1.class b/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$1.class
deleted file mode 100644
index 2487c76..0000000
Binary files a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$1.class and /dev/null differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class b/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class
index 164f15f..3311e16 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class and b/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyHostnameVerifier.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyTrustManager.class b/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyTrustManager.class
index 2db7444..e9638af 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyTrustManager.class and b/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils$TrustAnyTrustManager.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils.class b/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils.class
index fc5bb92..d7b51a2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/http/HttpUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/ip/AddressUtils.class b/djhk-common/target/classes/com/djhk/common/utils/ip/AddressUtils.class
index d4f2b69..0ba6b4b 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/ip/AddressUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/ip/AddressUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/ip/IpUtils.class b/djhk-common/target/classes/com/djhk/common/utils/ip/IpUtils.class
index 7df09d7..e6ef963 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/ip/IpUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/ip/IpUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelHandlerAdapter.class b/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelHandlerAdapter.class
index ec89856..89cff88 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelHandlerAdapter.class and b/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelHandlerAdapter.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelUtil.class b/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelUtil.class
index 2af5ecf..313ea2d 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelUtil.class and b/djhk-common/target/classes/com/djhk/common/utils/poi/ExcelUtil.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/reflect/ReflectUtils.class b/djhk-common/target/classes/com/djhk/common/utils/reflect/ReflectUtils.class
index f96d9f5..aa06254 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/reflect/ReflectUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/reflect/ReflectUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/sign/Base64.class b/djhk-common/target/classes/com/djhk/common/utils/sign/Base64.class
index 9bf2908..0a0b2b9 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/sign/Base64.class and b/djhk-common/target/classes/com/djhk/common/utils/sign/Base64.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/sign/Md5Utils.class b/djhk-common/target/classes/com/djhk/common/utils/sign/Md5Utils.class
index 305d8a9..e60fac2 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/sign/Md5Utils.class and b/djhk-common/target/classes/com/djhk/common/utils/sign/Md5Utils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/spring/SpringUtils.class b/djhk-common/target/classes/com/djhk/common/utils/spring/SpringUtils.class
index 212d6a4..293e9e7 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/spring/SpringUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/spring/SpringUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/sql/SqlUtil.class b/djhk-common/target/classes/com/djhk/common/utils/sql/SqlUtil.class
index 2a662ee..d77de0d 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/sql/SqlUtil.class and b/djhk-common/target/classes/com/djhk/common/utils/sql/SqlUtil.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/uuid/IdUtils.class b/djhk-common/target/classes/com/djhk/common/utils/uuid/IdUtils.class
index abf0ee7..d65dd36 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/uuid/IdUtils.class and b/djhk-common/target/classes/com/djhk/common/utils/uuid/IdUtils.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/uuid/Seq.class b/djhk-common/target/classes/com/djhk/common/utils/uuid/Seq.class
index 9724053..900ae9e 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/uuid/Seq.class and b/djhk-common/target/classes/com/djhk/common/utils/uuid/Seq.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID$Holder.class b/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID$Holder.class
index 79f17da..035a57d 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID$Holder.class and b/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID$Holder.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID.class b/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID.class
index 00d6b1b..dee7b97 100644
Binary files a/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID.class and b/djhk-common/target/classes/com/djhk/common/utils/uuid/UUID.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/xss/Xss.class b/djhk-common/target/classes/com/djhk/common/xss/Xss.class
index 1160bb6..93743b1 100644
Binary files a/djhk-common/target/classes/com/djhk/common/xss/Xss.class and b/djhk-common/target/classes/com/djhk/common/xss/Xss.class differ
diff --git a/djhk-common/target/classes/com/djhk/common/xss/XssValidator.class b/djhk-common/target/classes/com/djhk/common/xss/XssValidator.class
index 6b40c86..a78fda7 100644
Binary files a/djhk-common/target/classes/com/djhk/common/xss/XssValidator.class and b/djhk-common/target/classes/com/djhk/common/xss/XssValidator.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/aspectj/DataScopeAspect.class b/djhk-framework/target/classes/com/djhk/framework/aspectj/DataScopeAspect.class
index 967d587..66c6618 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/aspectj/DataScopeAspect.class and b/djhk-framework/target/classes/com/djhk/framework/aspectj/DataScopeAspect.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/aspectj/DataSourceAspect.class b/djhk-framework/target/classes/com/djhk/framework/aspectj/DataSourceAspect.class
index f89dbc6..6964a84 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/aspectj/DataSourceAspect.class and b/djhk-framework/target/classes/com/djhk/framework/aspectj/DataSourceAspect.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/aspectj/LogAspect.class b/djhk-framework/target/classes/com/djhk/framework/aspectj/LogAspect.class
index fe8f60f..cd1c7c3 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/aspectj/LogAspect.class and b/djhk-framework/target/classes/com/djhk/framework/aspectj/LogAspect.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/aspectj/RateLimiterAspect.class b/djhk-framework/target/classes/com/djhk/framework/aspectj/RateLimiterAspect.class
index 641d22b..3e6a0e7 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/aspectj/RateLimiterAspect.class and b/djhk-framework/target/classes/com/djhk/framework/aspectj/RateLimiterAspect.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/ApplicationConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/ApplicationConfig.class
index 5341878..cc4d814 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/ApplicationConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/ApplicationConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/CaptchaConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/CaptchaConfig.class
index f57bedb..b1b5343 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/CaptchaConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/CaptchaConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig$1.class b/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig$1.class
index 51e9065..6a2f905 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig$1.class and b/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig$1.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig.class
index 246a72e..7472a58 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/DruidConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/FastJson2JsonRedisSerializer.class b/djhk-framework/target/classes/com/djhk/framework/config/FastJson2JsonRedisSerializer.class
index ca09774..654f226 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/FastJson2JsonRedisSerializer.class and b/djhk-framework/target/classes/com/djhk/framework/config/FastJson2JsonRedisSerializer.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/FilterConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/FilterConfig.class
index fc54467..1613a5c 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/FilterConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/FilterConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/I18nConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/I18nConfig.class
index 6fc2712..d4665cf 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/I18nConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/I18nConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/KaptchaTextCreator.class b/djhk-framework/target/classes/com/djhk/framework/config/KaptchaTextCreator.class
index 4944367..7a10e2c 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/KaptchaTextCreator.class and b/djhk-framework/target/classes/com/djhk/framework/config/KaptchaTextCreator.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/MyBatisConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/MyBatisConfig.class
index 2bf07cb..f8c5305 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/MyBatisConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/MyBatisConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/RedisConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/RedisConfig.class
index 8266a2a..0836729 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/RedisConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/RedisConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/ResourcesConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/ResourcesConfig.class
index 21ce8a4..c13b3f5 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/ResourcesConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/ResourcesConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/SecurityConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/SecurityConfig.class
index 23d67db..b6b00c8 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/SecurityConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/SecurityConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/ServerConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/ServerConfig.class
index a48e167..eb24093 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/ServerConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/ServerConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig$1.class b/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig$1.class
index 8aa59c0..b71289c 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig$1.class and b/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig$1.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig.class b/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig.class
index cd029a2..195aa2a 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig.class and b/djhk-framework/target/classes/com/djhk/framework/config/ThreadPoolConfig.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/properties/DruidProperties.class b/djhk-framework/target/classes/com/djhk/framework/config/properties/DruidProperties.class
index bfdcd49..706c07f 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/properties/DruidProperties.class and b/djhk-framework/target/classes/com/djhk/framework/config/properties/DruidProperties.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/config/properties/PermitAllUrlProperties.class b/djhk-framework/target/classes/com/djhk/framework/config/properties/PermitAllUrlProperties.class
index a3af311..86a4fff 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/config/properties/PermitAllUrlProperties.class and b/djhk-framework/target/classes/com/djhk/framework/config/properties/PermitAllUrlProperties.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSource.class b/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSource.class
index 17ad176..5da693d 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSource.class and b/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSource.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSourceContextHolder.class b/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSourceContextHolder.class
index 39607df..dbf5331 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSourceContextHolder.class and b/djhk-framework/target/classes/com/djhk/framework/datasource/DynamicDataSourceContextHolder.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/interceptor/RepeatSubmitInterceptor.class b/djhk-framework/target/classes/com/djhk/framework/interceptor/RepeatSubmitInterceptor.class
index ae16897..652789a 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/interceptor/RepeatSubmitInterceptor.class and b/djhk-framework/target/classes/com/djhk/framework/interceptor/RepeatSubmitInterceptor.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/interceptor/impl/SameUrlDataInterceptor.class b/djhk-framework/target/classes/com/djhk/framework/interceptor/impl/SameUrlDataInterceptor.class
index e3d9932..980d2ea 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/interceptor/impl/SameUrlDataInterceptor.class and b/djhk-framework/target/classes/com/djhk/framework/interceptor/impl/SameUrlDataInterceptor.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/manager/AsyncManager.class b/djhk-framework/target/classes/com/djhk/framework/manager/AsyncManager.class
index 91e141d..f039f79 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/manager/AsyncManager.class and b/djhk-framework/target/classes/com/djhk/framework/manager/AsyncManager.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/manager/ShutdownManager.class b/djhk-framework/target/classes/com/djhk/framework/manager/ShutdownManager.class
index 48e821c..cd6007e 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/manager/ShutdownManager.class and b/djhk-framework/target/classes/com/djhk/framework/manager/ShutdownManager.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$1.class b/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$1.class
index 8f15f18..0059254 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$1.class and b/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$1.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$2.class b/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$2.class
index b3ba8c4..1c52f98 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$2.class and b/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory$2.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory.class b/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory.class
index 16f828c..ad717f4 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory.class and b/djhk-framework/target/classes/com/djhk/framework/manager/factory/AsyncFactory.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/security/context/AuthenticationContextHolder.class b/djhk-framework/target/classes/com/djhk/framework/security/context/AuthenticationContextHolder.class
index 8edcb2b..ce8ac42 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/security/context/AuthenticationContextHolder.class and b/djhk-framework/target/classes/com/djhk/framework/security/context/AuthenticationContextHolder.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/security/context/PermissionContextHolder.class b/djhk-framework/target/classes/com/djhk/framework/security/context/PermissionContextHolder.class
index bfcc9d8..0491a4c 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/security/context/PermissionContextHolder.class and b/djhk-framework/target/classes/com/djhk/framework/security/context/PermissionContextHolder.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/security/filter/JwtAuthenticationTokenFilter.class b/djhk-framework/target/classes/com/djhk/framework/security/filter/JwtAuthenticationTokenFilter.class
index d0c6512..ff756d2 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/security/filter/JwtAuthenticationTokenFilter.class and b/djhk-framework/target/classes/com/djhk/framework/security/filter/JwtAuthenticationTokenFilter.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/security/handle/AuthenticationEntryPointImpl.class b/djhk-framework/target/classes/com/djhk/framework/security/handle/AuthenticationEntryPointImpl.class
index 3325552..a3e50ed 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/security/handle/AuthenticationEntryPointImpl.class and b/djhk-framework/target/classes/com/djhk/framework/security/handle/AuthenticationEntryPointImpl.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/security/handle/LogoutSuccessHandlerImpl.class b/djhk-framework/target/classes/com/djhk/framework/security/handle/LogoutSuccessHandlerImpl.class
index 0dc338e..b5b467d 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/security/handle/LogoutSuccessHandlerImpl.class and b/djhk-framework/target/classes/com/djhk/framework/security/handle/LogoutSuccessHandlerImpl.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/domain/Server.class b/djhk-framework/target/classes/com/djhk/framework/web/domain/Server.class
index 4a69fc1..0910860 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/domain/Server.class and b/djhk-framework/target/classes/com/djhk/framework/web/domain/Server.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Cpu.class b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Cpu.class
index 2b6280a..b586b05 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Cpu.class and b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Cpu.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Jvm.class b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Jvm.class
index b3715c2..ca8cd1e 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Jvm.class and b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Jvm.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Mem.class b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Mem.class
index 8753542..5b97175 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Mem.class and b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Mem.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Sys.class b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Sys.class
index 77352d3..a03cd96 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Sys.class and b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/Sys.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/SysFile.class b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/SysFile.class
index ed9f8bf..0d5c778 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/domain/server/SysFile.class and b/djhk-framework/target/classes/com/djhk/framework/web/domain/server/SysFile.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/exception/GlobalExceptionHandler.class b/djhk-framework/target/classes/com/djhk/framework/web/exception/GlobalExceptionHandler.class
index 1aa43cc..a224887 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/exception/GlobalExceptionHandler.class and b/djhk-framework/target/classes/com/djhk/framework/web/exception/GlobalExceptionHandler.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/service/PermissionService.class b/djhk-framework/target/classes/com/djhk/framework/web/service/PermissionService.class
index 3e463b6..3cc32ee 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/service/PermissionService.class and b/djhk-framework/target/classes/com/djhk/framework/web/service/PermissionService.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/service/SysLoginService.class b/djhk-framework/target/classes/com/djhk/framework/web/service/SysLoginService.class
index f4ed69a..c9ff8e0 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/service/SysLoginService.class and b/djhk-framework/target/classes/com/djhk/framework/web/service/SysLoginService.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/service/SysPasswordService.class b/djhk-framework/target/classes/com/djhk/framework/web/service/SysPasswordService.class
index 7f461bc..4e4c452 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/service/SysPasswordService.class and b/djhk-framework/target/classes/com/djhk/framework/web/service/SysPasswordService.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/service/SysPermissionService.class b/djhk-framework/target/classes/com/djhk/framework/web/service/SysPermissionService.class
index c53fa68..ae4467d 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/service/SysPermissionService.class and b/djhk-framework/target/classes/com/djhk/framework/web/service/SysPermissionService.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/service/SysRegisterService.class b/djhk-framework/target/classes/com/djhk/framework/web/service/SysRegisterService.class
index 3cd5dea..5971c5d 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/service/SysRegisterService.class and b/djhk-framework/target/classes/com/djhk/framework/web/service/SysRegisterService.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/service/TokenService.class b/djhk-framework/target/classes/com/djhk/framework/web/service/TokenService.class
index 7f035ce..600e30f 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/service/TokenService.class and b/djhk-framework/target/classes/com/djhk/framework/web/service/TokenService.class differ
diff --git a/djhk-framework/target/classes/com/djhk/framework/web/service/UserDetailsServiceImpl.class b/djhk-framework/target/classes/com/djhk/framework/web/service/UserDetailsServiceImpl.class
index 3618350..6e16c5f 100644
Binary files a/djhk-framework/target/classes/com/djhk/framework/web/service/UserDetailsServiceImpl.class and b/djhk-framework/target/classes/com/djhk/framework/web/service/UserDetailsServiceImpl.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/config/GenConfig.class b/djhk-generator/target/classes/com/djhk/generator/config/GenConfig.class
index 9d66ff9..2429100 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/config/GenConfig.class and b/djhk-generator/target/classes/com/djhk/generator/config/GenConfig.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/controller/GenController.class b/djhk-generator/target/classes/com/djhk/generator/controller/GenController.class
index 38a015b..234ea05 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/controller/GenController.class and b/djhk-generator/target/classes/com/djhk/generator/controller/GenController.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/domain/GenTable.class b/djhk-generator/target/classes/com/djhk/generator/domain/GenTable.class
index 8258cfd..fcefaca 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/domain/GenTable.class and b/djhk-generator/target/classes/com/djhk/generator/domain/GenTable.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/domain/GenTableColumn.class b/djhk-generator/target/classes/com/djhk/generator/domain/GenTableColumn.class
index ea1c2f6..06368f4 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/domain/GenTableColumn.class and b/djhk-generator/target/classes/com/djhk/generator/domain/GenTableColumn.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableColumnMapper.class b/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableColumnMapper.class
index 9ef30fe..ba44a45 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableColumnMapper.class and b/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableColumnMapper.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableMapper.class b/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableMapper.class
index 01e2f30..b758f12 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableMapper.class and b/djhk-generator/target/classes/com/djhk/generator/mapper/GenTableMapper.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/service/GenTableColumnServiceImpl.class b/djhk-generator/target/classes/com/djhk/generator/service/GenTableColumnServiceImpl.class
index f4d08c0..441fa89 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/service/GenTableColumnServiceImpl.class and b/djhk-generator/target/classes/com/djhk/generator/service/GenTableColumnServiceImpl.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/service/GenTableServiceImpl.class b/djhk-generator/target/classes/com/djhk/generator/service/GenTableServiceImpl.class
index ac7c0ea..405646d 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/service/GenTableServiceImpl.class and b/djhk-generator/target/classes/com/djhk/generator/service/GenTableServiceImpl.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/service/IGenTableColumnService.class b/djhk-generator/target/classes/com/djhk/generator/service/IGenTableColumnService.class
index 9fa9b08..0bef6a0 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/service/IGenTableColumnService.class and b/djhk-generator/target/classes/com/djhk/generator/service/IGenTableColumnService.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/service/IGenTableService.class b/djhk-generator/target/classes/com/djhk/generator/service/IGenTableService.class
index 6b84dd6..2bc8b82 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/service/IGenTableService.class and b/djhk-generator/target/classes/com/djhk/generator/service/IGenTableService.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/util/GenUtils.class b/djhk-generator/target/classes/com/djhk/generator/util/GenUtils.class
index d7418d9..db81e09 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/util/GenUtils.class and b/djhk-generator/target/classes/com/djhk/generator/util/GenUtils.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/util/VelocityInitializer.class b/djhk-generator/target/classes/com/djhk/generator/util/VelocityInitializer.class
index 41c02d0..8aee2aa 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/util/VelocityInitializer.class and b/djhk-generator/target/classes/com/djhk/generator/util/VelocityInitializer.class differ
diff --git a/djhk-generator/target/classes/com/djhk/generator/util/VelocityUtils.class b/djhk-generator/target/classes/com/djhk/generator/util/VelocityUtils.class
index b64e2c6..6602864 100644
Binary files a/djhk-generator/target/classes/com/djhk/generator/util/VelocityUtils.class and b/djhk-generator/target/classes/com/djhk/generator/util/VelocityUtils.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobController.class b/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobController.class
index 387ae9d..4eecd3c 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobController.class and b/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobController.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobLogController.class b/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobLogController.class
index 7343c4f..f6ff910 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobLogController.class and b/djhk-quartz/target/classes/com/djhk/quartz/controller/SysJobLogController.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJob.class b/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJob.class
index b098754..68c4ced 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJob.class and b/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJob.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJobLog.class b/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJobLog.class
index 86e2fbe..789dae1 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJobLog.class and b/djhk-quartz/target/classes/com/djhk/quartz/domain/SysJobLog.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobLogMapper.class b/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobLogMapper.class
index c032ddd..b21b744 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobLogMapper.class and b/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobLogMapper.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobMapper.class b/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobMapper.class
index f18015f..bc5df11 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobMapper.class and b/djhk-quartz/target/classes/com/djhk/quartz/mapper/SysJobMapper.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobLogService.class b/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobLogService.class
index d129dfd..f9fe14e 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobLogService.class and b/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobLogService.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobService.class b/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobService.class
index 8b27f96..13d77ae 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobService.class and b/djhk-quartz/target/classes/com/djhk/quartz/service/ISysJobService.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobLogServiceImpl.class b/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobLogServiceImpl.class
index cd86f65..46cac93 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobLogServiceImpl.class and b/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobLogServiceImpl.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobServiceImpl.class b/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobServiceImpl.class
index 7b872f1..3d1a1bb 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobServiceImpl.class and b/djhk-quartz/target/classes/com/djhk/quartz/service/impl/SysJobServiceImpl.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/task/RyTask.class b/djhk-quartz/target/classes/com/djhk/quartz/task/RyTask.class
index cb62b62..3430a90 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/task/RyTask.class and b/djhk-quartz/target/classes/com/djhk/quartz/task/RyTask.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/util/AbstractQuartzJob.class b/djhk-quartz/target/classes/com/djhk/quartz/util/AbstractQuartzJob.class
index 686e6ba..1be90d4 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/util/AbstractQuartzJob.class and b/djhk-quartz/target/classes/com/djhk/quartz/util/AbstractQuartzJob.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/util/CronUtils.class b/djhk-quartz/target/classes/com/djhk/quartz/util/CronUtils.class
index 843ae10..bff82c4 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/util/CronUtils.class and b/djhk-quartz/target/classes/com/djhk/quartz/util/CronUtils.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/util/JobInvokeUtil.class b/djhk-quartz/target/classes/com/djhk/quartz/util/JobInvokeUtil.class
index 0d5ad7f..420b68c 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/util/JobInvokeUtil.class and b/djhk-quartz/target/classes/com/djhk/quartz/util/JobInvokeUtil.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzDisallowConcurrentExecution.class b/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzDisallowConcurrentExecution.class
index 9514e15..fc885ea 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzDisallowConcurrentExecution.class and b/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzDisallowConcurrentExecution.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzJobExecution.class b/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzJobExecution.class
index 4d18ef6..99a8926 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzJobExecution.class and b/djhk-quartz/target/classes/com/djhk/quartz/util/QuartzJobExecution.class differ
diff --git a/djhk-quartz/target/classes/com/djhk/quartz/util/ScheduleUtils.class b/djhk-quartz/target/classes/com/djhk/quartz/util/ScheduleUtils.class
index 29fbacb..3be828e 100644
Binary files a/djhk-quartz/target/classes/com/djhk/quartz/util/ScheduleUtils.class and b/djhk-quartz/target/classes/com/djhk/quartz/util/ScheduleUtils.class differ
diff --git a/djhk-system/pom.xml b/djhk-system/pom.xml
index a66ca4e..03660d1 100644
--- a/djhk-system/pom.xml
+++ b/djhk-system/pom.xml
@@ -23,6 +23,30 @@
             <artifactId>djhk-common</artifactId>
         </dependency>
 
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+
+        <!-- 阿里数据库连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysCache.java b/djhk-system/src/main/java/com/djhk/system/domain/SysCache.java
deleted file mode 100644
index e1fb45f..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysCache.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.djhk.system.domain;
-
-import com.djhk.common.utils.StringUtils;
-
-/**
- * 缓存信息
- * 
- * @author djhk
- */
-public class SysCache
-{
-    /** 缓存名称 */
-    private String cacheName = "";
-
-    /** 缓存键名 */
-    private String cacheKey = "";
-
-    /** 缓存内容 */
-    private String cacheValue = "";
-
-    /** 备注 */
-    private String remark = "";
-
-    public SysCache()
-    {
-
-    }
-
-    public SysCache(String cacheName, String remark)
-    {
-        this.cacheName = cacheName;
-        this.remark = remark;
-    }
-
-    public SysCache(String cacheName, String cacheKey, String cacheValue)
-    {
-        this.cacheName = StringUtils.replace(cacheName, ":", "");
-        this.cacheKey = StringUtils.replace(cacheKey, cacheName, "");
-        this.cacheValue = cacheValue;
-    }
-
-    public String getCacheName()
-    {
-        return cacheName;
-    }
-
-    public void setCacheName(String cacheName)
-    {
-        this.cacheName = cacheName;
-    }
-
-    public String getCacheKey()
-    {
-        return cacheKey;
-    }
-
-    public void setCacheKey(String cacheKey)
-    {
-        this.cacheKey = cacheKey;
-    }
-
-    public String getCacheValue()
-    {
-        return cacheValue;
-    }
-
-    public void setCacheValue(String cacheValue)
-    {
-        this.cacheValue = cacheValue;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysConfig.java b/djhk-system/src/main/java/com/djhk/system/domain/SysConfig.java
deleted file mode 100644
index 0531591..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysConfig.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.djhk.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.djhk.common.annotation.Excel;
-import com.djhk.common.annotation.Excel.ColumnType;
-import com.djhk.common.core.domain.BaseEntity;
-
-/**
- * 参数配置表 sys_config
- * 
- * @author djhk
- */
-public class SysConfig extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 参数主键 */
-    @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
-    private Long configId;
-
-    /** 参数名称 */
-    @Excel(name = "参数名称")
-    private String configName;
-
-    /** 参数键名 */
-    @Excel(name = "参数键名")
-    private String configKey;
-
-    /** 参数键值 */
-    @Excel(name = "参数键值")
-    private String configValue;
-
-    /** 系统内置（Y是 N否） */
-    @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
-    private String configType;
-
-    public Long getConfigId()
-    {
-        return configId;
-    }
-
-    public void setConfigId(Long configId)
-    {
-        this.configId = configId;
-    }
-
-    @NotBlank(message = "参数名称不能为空")
-    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
-    public String getConfigName()
-    {
-        return configName;
-    }
-
-    public void setConfigName(String configName)
-    {
-        this.configName = configName;
-    }
-
-    @NotBlank(message = "参数键名长度不能为空")
-    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
-    public String getConfigKey()
-    {
-        return configKey;
-    }
-
-    public void setConfigKey(String configKey)
-    {
-        this.configKey = configKey;
-    }
-
-    @NotBlank(message = "参数键值不能为空")
-    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
-    public String getConfigValue()
-    {
-        return configValue;
-    }
-
-    public void setConfigValue(String configValue)
-    {
-        this.configValue = configValue;
-    }
-
-    public String getConfigType()
-    {
-        return configType;
-    }
-
-    public void setConfigType(String configType)
-    {
-        this.configType = configType;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("configId", getConfigId())
-            .append("configName", getConfigName())
-            .append("configKey", getConfigKey())
-            .append("configValue", getConfigValue())
-            .append("configType", getConfigType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysLogininfor.java b/djhk-system/src/main/java/com/djhk/system/domain/SysLogininfor.java
deleted file mode 100644
index 9ed5157..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysLogininfor.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.djhk.system.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.djhk.common.annotation.Excel;
-import com.djhk.common.annotation.Excel.ColumnType;
-import com.djhk.common.core.domain.BaseEntity;
-
-/**
- * 系统访问记录表 sys_logininfor
- * 
- * @author djhk
- */
-public class SysLogininfor extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
-    private Long infoId;
-
-    /** 用户账号 */
-    @Excel(name = "用户账号")
-    private String userName;
-
-    /** 登录状态 0成功 1失败 */
-    @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
-    private String status;
-
-    /** 登录IP地址 */
-    @Excel(name = "登录地址")
-    private String ipaddr;
-
-    /** 登录地点 */
-    @Excel(name = "登录地点")
-    private String loginLocation;
-
-    /** 浏览器类型 */
-    @Excel(name = "浏览器")
-    private String browser;
-
-    /** 操作系统 */
-    @Excel(name = "操作系统")
-    private String os;
-
-    /** 提示消息 */
-    @Excel(name = "提示消息")
-    private String msg;
-
-    /** 访问时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date loginTime;
-
-    public Long getInfoId()
-    {
-        return infoId;
-    }
-
-    public void setInfoId(Long infoId)
-    {
-        this.infoId = infoId;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-
-    public Date getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Date loginTime)
-    {
-        this.loginTime = loginTime;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysNotice.java b/djhk-system/src/main/java/com/djhk/system/domain/SysNotice.java
deleted file mode 100644
index d4ec046..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysNotice.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.djhk.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.djhk.common.core.domain.BaseEntity;
-import com.djhk.common.xss.Xss;
-
-/**
- * 通知公告表 sys_notice
- * 
- * @author djhk
- */
-public class SysNotice extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 公告ID */
-    private Long noticeId;
-
-    /** 公告标题 */
-    private String noticeTitle;
-
-    /** 公告类型（1通知 2公告） */
-    private String noticeType;
-
-    /** 公告内容 */
-    private String noticeContent;
-
-    /** 公告状态（0正常 1关闭） */
-    private String status;
-
-    public Long getNoticeId()
-    {
-        return noticeId;
-    }
-
-    public void setNoticeId(Long noticeId)
-    {
-        this.noticeId = noticeId;
-    }
-
-    public void setNoticeTitle(String noticeTitle)
-    {
-        this.noticeTitle = noticeTitle;
-    }
-
-    @Xss(message = "公告标题不能包含脚本字符")
-    @NotBlank(message = "公告标题不能为空")
-    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
-    public String getNoticeTitle()
-    {
-        return noticeTitle;
-    }
-
-    public void setNoticeType(String noticeType)
-    {
-        this.noticeType = noticeType;
-    }
-
-    public String getNoticeType()
-    {
-        return noticeType;
-    }
-
-    public void setNoticeContent(String noticeContent)
-    {
-        this.noticeContent = noticeContent;
-    }
-
-    public String getNoticeContent()
-    {
-        return noticeContent;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysOperLog.java b/djhk-system/src/main/java/com/djhk/system/domain/SysOperLog.java
deleted file mode 100644
index 5dd9ac2..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysOperLog.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package com.djhk.system.domain;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.djhk.common.annotation.Excel;
-import com.djhk.common.annotation.Excel.ColumnType;
-import com.djhk.common.core.domain.BaseEntity;
-
-/**
- * 操作日志记录表 oper_log
- * 
- * @author djhk
- */
-public class SysOperLog extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 日志主键 */
-    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
-    private Long operId;
-
-    /** 操作模块 */
-    @Excel(name = "操作模块")
-    private String title;
-
-    /** 业务类型（0其它 1新增 2修改 3删除） */
-    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
-    private Integer businessType;
-
-    /** 业务类型数组 */
-    private Integer[] businessTypes;
-
-    /** 请求方法 */
-    @Excel(name = "请求方法")
-    private String method;
-
-    /** 请求方式 */
-    @Excel(name = "请求方式")
-    private String requestMethod;
-
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
-    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
-    private Integer operatorType;
-
-    /** 操作人员 */
-    @Excel(name = "操作人员")
-    private String operName;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String deptName;
-
-    /** 请求url */
-    @Excel(name = "请求地址")
-    private String operUrl;
-
-    /** 操作地址 */
-    @Excel(name = "操作地址")
-    private String operIp;
-
-    /** 操作地点 */
-    @Excel(name = "操作地点")
-    private String operLocation;
-
-    /** 请求参数 */
-    @Excel(name = "请求参数")
-    private String operParam;
-
-    /** 返回参数 */
-    @Excel(name = "返回参数")
-    private String jsonResult;
-
-    /** 操作状态（0正常 1异常） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
-    private Integer status;
-
-    /** 错误消息 */
-    @Excel(name = "错误消息")
-    private String errorMsg;
-
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
-
-    /** 消耗时间 */
-    @Excel(name = "消耗时间", suffix = "毫秒")
-    private Long costTime;
-
-    public Long getOperId()
-    {
-        return operId;
-    }
-
-    public void setOperId(Long operId)
-    {
-        this.operId = operId;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public Integer getBusinessType()
-    {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType)
-    {
-        this.businessType = businessType;
-    }
-
-    public Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
-
-    public String getMethod()
-    {
-        return method;
-    }
-
-    public void setMethod(String method)
-    {
-        this.method = method;
-    }
-
-    public String getRequestMethod()
-    {
-        return requestMethod;
-    }
-
-    public void setRequestMethod(String requestMethod)
-    {
-        this.requestMethod = requestMethod;
-    }
-
-    public Integer getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public void setOperatorType(Integer operatorType)
-    {
-        this.operatorType = operatorType;
-    }
-
-    public String getOperName()
-    {
-        return operName;
-    }
-
-    public void setOperName(String operName)
-    {
-        this.operName = operName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getOperUrl()
-    {
-        return operUrl;
-    }
-
-    public void setOperUrl(String operUrl)
-    {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperIp()
-    {
-        return operIp;
-    }
-
-    public void setOperIp(String operIp)
-    {
-        this.operIp = operIp;
-    }
-
-    public String getOperLocation()
-    {
-        return operLocation;
-    }
-
-    public void setOperLocation(String operLocation)
-    {
-        this.operLocation = operLocation;
-    }
-
-    public String getOperParam()
-    {
-        return operParam;
-    }
-
-    public void setOperParam(String operParam)
-    {
-        this.operParam = operParam;
-    }
-
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public String getErrorMsg()
-    {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg)
-    {
-        this.errorMsg = errorMsg;
-    }
-
-    public Date getOperTime()
-    {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime)
-    {
-        this.operTime = operTime;
-    }
-
-    public Long getCostTime()
-    {
-        return costTime;
-    }
-
-    public void setCostTime(Long costTime)
-    {
-        this.costTime = costTime;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysPost.java b/djhk-system/src/main/java/com/djhk/system/domain/SysPost.java
deleted file mode 100644
index ef316c8..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysPost.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.djhk.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.djhk.common.annotation.Excel;
-import com.djhk.common.annotation.Excel.ColumnType;
-import com.djhk.common.core.domain.BaseEntity;
-
-/**
- * 岗位表 sys_post
- * 
- * @author djhk
- */
-public class SysPost extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 岗位序号 */
-    @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
-    private Long postId;
-
-    /** 岗位编码 */
-    @Excel(name = "岗位编码")
-    private String postCode;
-
-    /** 岗位名称 */
-    @Excel(name = "岗位名称")
-    private String postName;
-
-    /** 岗位排序 */
-    @Excel(name = "岗位排序")
-    private Integer postSort;
-
-    /** 状态（0正常 1停用） */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /** 用户是否存在此岗位标识 默认不存在 */
-    private boolean flag = false;
-
-    public Long getPostId()
-    {
-        return postId;
-    }
-
-    public void setPostId(Long postId)
-    {
-        this.postId = postId;
-    }
-
-    @NotBlank(message = "岗位编码不能为空")
-    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
-    public String getPostCode()
-    {
-        return postCode;
-    }
-
-    public void setPostCode(String postCode)
-    {
-        this.postCode = postCode;
-    }
-
-    @NotBlank(message = "岗位名称不能为空")
-    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
-    public String getPostName()
-    {
-        return postName;
-    }
-
-    public void setPostName(String postName)
-    {
-        this.postName = postName;
-    }
-
-    @NotNull(message = "显示顺序不能为空")
-    public Integer getPostSort()
-    {
-        return postSort;
-    }
-
-    public void setPostSort(Integer postSort)
-    {
-        this.postSort = postSort;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public boolean isFlag()
-    {
-        return flag;
-    }
-
-    public void setFlag(boolean flag)
-    {
-        this.flag = flag;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("postId", getPostId())
-            .append("postCode", getPostCode())
-            .append("postName", getPostName())
-            .append("postSort", getPostSort())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysRoleDept.java b/djhk-system/src/main/java/com/djhk/system/domain/SysRoleDept.java
deleted file mode 100644
index 5745029..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysRoleDept.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.djhk.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 角色和部门关联 sys_role_dept
- * 
- * @author djhk
- */
-public class SysRoleDept
-{
-    /** 角色ID */
-    private Long roleId;
-    
-    /** 部门ID */
-    private Long deptId;
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("deptId", getDeptId())
-            .toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysRoleMenu.java b/djhk-system/src/main/java/com/djhk/system/domain/SysRoleMenu.java
deleted file mode 100644
index a595e40..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysRoleMenu.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.djhk.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 角色和菜单关联 sys_role_menu
- * 
- * @author djhk
- */
-public class SysRoleMenu
-{
-    /** 角色ID */
-    private Long roleId;
-    
-    /** 菜单ID */
-    private Long menuId;
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getMenuId()
-    {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId)
-    {
-        this.menuId = menuId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("menuId", getMenuId())
-            .toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysUserOnline.java b/djhk-system/src/main/java/com/djhk/system/domain/SysUserOnline.java
deleted file mode 100644
index 559b0f6..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysUserOnline.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.djhk.system.domain;
-
-/**
- * 当前在线会话
- * 
- * @author djhk
- */
-public class SysUserOnline
-{
-    /** 会话编号 */
-    private String tokenId;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 用户名称 */
-    private String userName;
-
-    /** 登录IP地址 */
-    private String ipaddr;
-
-    /** 登录地址 */
-    private String loginLocation;
-
-    /** 浏览器类型 */
-    private String browser;
-
-    /** 操作系统 */
-    private String os;
-
-    /** 登录时间 */
-    private Long loginTime;
-
-    public String getTokenId()
-    {
-        return tokenId;
-    }
-
-    public void setTokenId(String tokenId)
-    {
-        this.tokenId = tokenId;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public Long getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Long loginTime)
-    {
-        this.loginTime = loginTime;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysUserPost.java b/djhk-system/src/main/java/com/djhk/system/domain/SysUserPost.java
deleted file mode 100644
index 2fdac11..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysUserPost.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.djhk.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 用户和岗位关联 sys_user_post
- * 
- * @author djhk
- */
-public class SysUserPost
-{
-    /** 用户ID */
-    private Long userId;
-    
-    /** 岗位ID */
-    private Long postId;
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getPostId()
-    {
-        return postId;
-    }
-
-    public void setPostId(Long postId)
-    {
-        this.postId = postId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("postId", getPostId())
-            .toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/SysUserRole.java b/djhk-system/src/main/java/com/djhk/system/domain/SysUserRole.java
deleted file mode 100644
index cb8bad7..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/SysUserRole.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.djhk.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 用户和角色关联 sys_user_role
- * 
- * @author djhk
- */
-public class SysUserRole
-{
-    /** 用户ID */
-    private Long userId;
-    
-    /** 角色ID */
-    private Long roleId;
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("roleId", getRoleId())
-            .toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/vo/MetaVo.java b/djhk-system/src/main/java/com/djhk/system/domain/vo/MetaVo.java
deleted file mode 100644
index 673e952..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/vo/MetaVo.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.djhk.system.domain.vo;
-
-import com.djhk.common.utils.StringUtils;
-
-/**
- * 路由显示信息
- * 
- * @author djhk
- */
-public class MetaVo
-{
-    /**
-     * 设置该路由在侧边栏和面包屑中展示的名字
-     */
-    private String title;
-
-    /**
-     * 设置该路由的图标，对应路径src/assets/icons/svg
-     */
-    private String icon;
-
-    /**
-     * 设置为true，则不会被 <keep-alive>缓存
-     */
-    private boolean noCache;
-
-    /**
-     * 内链地址（http(s)://开头）
-     */
-    private String link;
-
-    public MetaVo()
-    {
-    }
-
-    public MetaVo(String title, String icon)
-    {
-        this.title = title;
-        this.icon = icon;
-    }
-
-    public MetaVo(String title, String icon, boolean noCache)
-    {
-        this.title = title;
-        this.icon = icon;
-        this.noCache = noCache;
-    }
-
-    public MetaVo(String title, String icon, String link)
-    {
-        this.title = title;
-        this.icon = icon;
-        this.link = link;
-    }
-
-    public MetaVo(String title, String icon, boolean noCache, String link)
-    {
-        this.title = title;
-        this.icon = icon;
-        this.noCache = noCache;
-        if (StringUtils.ishttp(link))
-        {
-            this.link = link;
-        }
-    }
-
-    public boolean isNoCache()
-    {
-        return noCache;
-    }
-
-    public void setNoCache(boolean noCache)
-    {
-        this.noCache = noCache;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public String getIcon()
-    {
-        return icon;
-    }
-
-    public void setIcon(String icon)
-    {
-        this.icon = icon;
-    }
-
-    public String getLink()
-    {
-        return link;
-    }
-
-    public void setLink(String link)
-    {
-        this.link = link;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/domain/vo/RouterVo.java b/djhk-system/src/main/java/com/djhk/system/domain/vo/RouterVo.java
deleted file mode 100644
index 98abedb..0000000
--- a/djhk-system/src/main/java/com/djhk/system/domain/vo/RouterVo.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.djhk.system.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import java.util.List;
-
-/**
- * 路由配置信息
- * 
- * @author djhk
- */
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
-{
-    /**
-     * 路由名字
-     */
-    private String name;
-
-    /**
-     * 路由地址
-     */
-    private String path;
-
-    /**
-     * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
-     */
-    private boolean hidden;
-
-    /**
-     * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
-     */
-    private String redirect;
-
-    /**
-     * 组件地址
-     */
-    private String component;
-
-    /**
-     * 路由参数：如 {"id": 1, "name": "ry"}
-     */
-    private String query;
-
-    /**
-     * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
-     */
-    private Boolean alwaysShow;
-
-    /**
-     * 其他元素
-     */
-    private MetaVo meta;
-
-    /**
-     * 子路由
-     */
-    private List<RouterVo> children;
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getPath()
-    {
-        return path;
-    }
-
-    public void setPath(String path)
-    {
-        this.path = path;
-    }
-
-    public boolean getHidden()
-    {
-        return hidden;
-    }
-
-    public void setHidden(boolean hidden)
-    {
-        this.hidden = hidden;
-    }
-
-    public String getRedirect()
-    {
-        return redirect;
-    }
-
-    public void setRedirect(String redirect)
-    {
-        this.redirect = redirect;
-    }
-
-    public String getComponent()
-    {
-        return component;
-    }
-
-    public void setComponent(String component)
-    {
-        this.component = component;
-    }
-
-    public String getQuery()
-    {
-        return query;
-    }
-
-    public void setQuery(String query)
-    {
-        this.query = query;
-    }
-
-    public Boolean getAlwaysShow()
-    {
-        return alwaysShow;
-    }
-
-    public void setAlwaysShow(Boolean alwaysShow)
-    {
-        this.alwaysShow = alwaysShow;
-    }
-
-    public MetaVo getMeta()
-    {
-        return meta;
-    }
-
-    public void setMeta(MetaVo meta)
-    {
-        this.meta = meta;
-    }
-
-    public List<RouterVo> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<RouterVo> children)
-    {
-        this.children = children;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysConfigMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysConfigMapper.java
deleted file mode 100644
index 76d1d0e..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysConfigMapper.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysConfig;
-
-/**
- * 参数配置 数据层
- * 
- * @author djhk
- */
-
-public interface SysConfigMapper
-{
-    /**
-     * 查询参数配置信息
-     * 
-     * @param config 参数配置信息
-     * @return 参数配置信息
-     */
-    public SysConfig selectConfig(SysConfig config);
-
-    /**
-     * 通过ID查询配置
-     * 
-     * @param configId 参数ID
-     * @return 参数配置信息
-     */
-    public SysConfig selectConfigById(Long configId);
-
-    /**
-     * 查询参数配置列表
-     * 
-     * @param config 参数配置信息
-     * @return 参数配置集合
-     */
-    public List<SysConfig> selectConfigList(SysConfig config);
-
-    /**
-     * 根据键名查询参数配置信息
-     * 
-     * @param configKey 参数键名
-     * @return 参数配置信息
-     */
-    public SysConfig checkConfigKeyUnique(String configKey);
-
-    /**
-     * 新增参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    public int insertConfig(SysConfig config);
-
-    /**
-     * 修改参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    public int updateConfig(SysConfig config);
-
-    /**
-     * 删除参数配置
-     * 
-     * @param configId 参数ID
-     * @return 结果
-     */
-    public int deleteConfigById(Long configId);
-
-    /**
-     * 批量删除参数信息
-     * 
-     * @param configIds 需要删除的参数ID
-     * @return 结果
-     */
-    public int deleteConfigByIds(Long[] configIds);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysDeptMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysDeptMapper.java
deleted file mode 100644
index 684c1ff..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysDeptMapper.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.djhk.common.core.domain.entity.SysDept;
-
-/**
- * 部门管理 数据层
- * 
- * @author djhk
- */
-public interface SysDeptMapper
-{
-    /**
-     * 查询部门管理数据
-     * 
-     * @param dept 部门信息
-     * @return 部门信息集合
-     */
-    public List<SysDept> selectDeptList(SysDept dept);
-
-    /**
-     * 根据角色ID查询部门树信息
-     * 
-     * @param roleId 角色ID
-     * @param deptCheckStrictly 部门树选择项是否关联显示
-     * @return 选中部门列表
-     */
-    public List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
-
-    /**
-     * 根据部门ID查询信息
-     * 
-     * @param deptId 部门ID
-     * @return 部门信息
-     */
-    public SysDept selectDeptById(Long deptId);
-
-    /**
-     * 根据ID查询所有子部门
-     * 
-     * @param deptId 部门ID
-     * @return 部门列表
-     */
-    public List<SysDept> selectChildrenDeptById(Long deptId);
-
-    /**
-     * 根据ID查询所有子部门（正常状态）
-     * 
-     * @param deptId 部门ID
-     * @return 子部门数
-     */
-    public int selectNormalChildrenDeptById(Long deptId);
-
-    /**
-     * 是否存在子节点
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int hasChildByDeptId(Long deptId);
-
-    /**
-     * 查询部门是否存在用户
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int checkDeptExistUser(Long deptId);
-
-    /**
-     * 校验部门名称是否唯一
-     * 
-     * @param deptName 部门名称
-     * @param parentId 父部门ID
-     * @return 结果
-     */
-    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
-
-    /**
-     * 新增部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    public int insertDept(SysDept dept);
-
-    /**
-     * 修改部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    public int updateDept(SysDept dept);
-
-    /**
-     * 修改所在部门正常状态
-     * 
-     * @param deptIds 部门ID组
-     */
-    public void updateDeptStatusNormal(Long[] deptIds);
-
-    /**
-     * 修改子元素关系
-     * 
-     * @param depts 子元素
-     * @return 结果
-     */
-    public int updateDeptChildren(@Param("depts") List<SysDept> depts);
-
-    /**
-     * 删除部门管理信息
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int deleteDeptById(Long deptId);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysDictDataMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysDictDataMapper.java
deleted file mode 100644
index a877852..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysDictDataMapper.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.djhk.common.core.domain.entity.SysDictData;
-
-/**
- * 字典表 数据层
- * 
- * @author djhk
- */
-public interface SysDictDataMapper
-{
-    /**
-     * 根据条件分页查询字典数据
-     * 
-     * @param dictData 字典数据信息
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataList(SysDictData dictData);
-
-    /**
-     * 根据字典类型查询字典数据
-     * 
-     * @param dictType 字典类型
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataByType(String dictType);
-
-    /**
-     * 根据字典类型和字典键值查询字典数据信息
-     * 
-     * @param dictType 字典类型
-     * @param dictValue 字典键值
-     * @return 字典标签
-     */
-    public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
-
-    /**
-     * 根据字典数据ID查询信息
-     * 
-     * @param dictCode 字典数据ID
-     * @return 字典数据
-     */
-    public SysDictData selectDictDataById(Long dictCode);
-
-    /**
-     * 查询字典数据
-     * 
-     * @param dictType 字典类型
-     * @return 字典数据
-     */
-    public int countDictDataByType(String dictType);
-
-    /**
-     * 通过字典ID删除字典数据信息
-     * 
-     * @param dictCode 字典数据ID
-     * @return 结果
-     */
-    public int deleteDictDataById(Long dictCode);
-
-    /**
-     * 批量删除字典数据信息
-     * 
-     * @param dictCodes 需要删除的字典数据ID
-     * @return 结果
-     */
-    public int deleteDictDataByIds(Long[] dictCodes);
-
-    /**
-     * 新增字典数据信息
-     * 
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int insertDictData(SysDictData dictData);
-
-    /**
-     * 修改字典数据信息
-     * 
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int updateDictData(SysDictData dictData);
-
-    /**
-     * 同步修改字典类型
-     * 
-     * @param oldDictType 旧字典类型
-     * @param newDictType 新旧字典类型
-     * @return 结果
-     */
-    public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysDictTypeMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysDictTypeMapper.java
deleted file mode 100644
index 4862757..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysDictTypeMapper.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.common.core.domain.entity.SysDictType;
-
-/**
- * 字典表 数据层
- * 
- * @author djhk
- */
-public interface SysDictTypeMapper
-{
-    /**
-     * 根据条件分页查询字典类型
-     * 
-     * @param dictType 字典类型信息
-     * @return 字典类型集合信息
-     */
-    public List<SysDictType> selectDictTypeList(SysDictType dictType);
-
-    /**
-     * 根据所有字典类型
-     * 
-     * @return 字典类型集合信息
-     */
-    public List<SysDictType> selectDictTypeAll();
-
-    /**
-     * 根据字典类型ID查询信息
-     * 
-     * @param dictId 字典类型ID
-     * @return 字典类型
-     */
-    public SysDictType selectDictTypeById(Long dictId);
-
-    /**
-     * 根据字典类型查询信息
-     * 
-     * @param dictType 字典类型
-     * @return 字典类型
-     */
-    public SysDictType selectDictTypeByType(String dictType);
-
-    /**
-     * 通过字典ID删除字典信息
-     * 
-     * @param dictId 字典ID
-     * @return 结果
-     */
-    public int deleteDictTypeById(Long dictId);
-
-    /**
-     * 批量删除字典类型信息
-     * 
-     * @param dictIds 需要删除的字典ID
-     * @return 结果
-     */
-    public int deleteDictTypeByIds(Long[] dictIds);
-
-    /**
-     * 新增字典类型信息
-     * 
-     * @param dictType 字典类型信息
-     * @return 结果
-     */
-    public int insertDictType(SysDictType dictType);
-
-    /**
-     * 修改字典类型信息
-     * 
-     * @param dictType 字典类型信息
-     * @return 结果
-     */
-    public int updateDictType(SysDictType dictType);
-
-    /**
-     * 校验字典类型称是否唯一
-     * 
-     * @param dictType 字典类型
-     * @return 结果
-     */
-    public SysDictType checkDictTypeUnique(String dictType);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysLogininforMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysLogininforMapper.java
deleted file mode 100644
index c65e1aa..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysLogininforMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysLogininfor;
-
-/**
- * 系统访问日志情况信息 数据层
- * 
- * @author djhk
- */
-public interface SysLogininforMapper
-{
-    /**
-     * 新增系统登录日志
-     * 
-     * @param logininfor 访问日志对象
-     */
-    public void insertLogininfor(SysLogininfor logininfor);
-
-    /**
-     * 查询系统登录日志集合
-     * 
-     * @param logininfor 访问日志对象
-     * @return 登录记录集合
-     */
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
-
-    /**
-     * 批量删除系统登录日志
-     * 
-     * @param infoIds 需要删除的登录日志ID
-     * @return 结果
-     */
-    public int deleteLogininforByIds(Long[] infoIds);
-
-    /**
-     * 清空系统登录日志
-     * 
-     * @return 结果
-     */
-    public int cleanLogininfor();
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysMenuMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysMenuMapper.java
deleted file mode 100644
index 722a6b4..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysMenuMapper.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.djhk.common.core.domain.entity.SysMenu;
-
-/**
- * 菜单表 数据层
- *
- * @author djhk
- */
-public interface SysMenuMapper
-{
-    /**
-     * 查询系统菜单列表
-     *
-     * @param menu 菜单信息
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuList(SysMenu menu);
-
-    /**
-     * 根据用户所有权限
-     *
-     * @return 权限列表
-     */
-    public List<String> selectMenuPerms();
-
-    /**
-     * 根据用户查询系统菜单列表
-     *
-     * @param menu 菜单信息
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuListByUserId(SysMenu menu);
-
-    /**
-     * 根据角色ID查询权限
-     * 
-     * @param roleId 角色ID
-     * @return 权限列表
-     */
-    public List<String> selectMenuPermsByRoleId(Long roleId);
-
-    /**
-     * 根据用户ID查询权限
-     *
-     * @param userId 用户ID
-     * @return 权限列表
-     */
-    public List<String> selectMenuPermsByUserId(Long userId);
-
-    /**
-     * 根据用户ID查询菜单
-     *
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuTreeAll();
-
-    /**
-     * 根据用户ID查询菜单
-     *
-     * @param userId 用户ID
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
-
-    /**
-     * 根据角色ID查询菜单树信息
-     * 
-     * @param roleId 角色ID
-     * @param menuCheckStrictly 菜单树选择项是否关联显示
-     * @return 选中菜单列表
-     */
-    public List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
-
-    /**
-     * 根据菜单ID查询信息
-     *
-     * @param menuId 菜单ID
-     * @return 菜单信息
-     */
-    public SysMenu selectMenuById(Long menuId);
-
-    /**
-     * 是否存在菜单子节点
-     *
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    public int hasChildByMenuId(Long menuId);
-
-    /**
-     * 新增菜单信息
-     *
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public int insertMenu(SysMenu menu);
-
-    /**
-     * 修改菜单信息
-     *
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public int updateMenu(SysMenu menu);
-
-    /**
-     * 删除菜单管理信息
-     *
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    public int deleteMenuById(Long menuId);
-
-    /**
-     * 校验菜单名称是否唯一
-     *
-     * @param menuName 菜单名称
-     * @param parentId 父菜单ID
-     * @return 结果
-     */
-    public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysNoticeMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysNoticeMapper.java
deleted file mode 100644
index 8323d76..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysNoticeMapper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysNotice;
-
-/**
- * 通知公告表 数据层
- * 
- * @author djhk
- */
-public interface SysNoticeMapper
-{
-    /**
-     * 查询公告信息
-     * 
-     * @param noticeId 公告ID
-     * @return 公告信息
-     */
-    public SysNotice selectNoticeById(Long noticeId);
-
-    /**
-     * 查询公告列表
-     * 
-     * @param notice 公告信息
-     * @return 公告集合
-     */
-    public List<SysNotice> selectNoticeList(SysNotice notice);
-
-    /**
-     * 新增公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    public int insertNotice(SysNotice notice);
-
-    /**
-     * 修改公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    public int updateNotice(SysNotice notice);
-
-    /**
-     * 批量删除公告
-     * 
-     * @param noticeId 公告ID
-     * @return 结果
-     */
-    public int deleteNoticeById(Long noticeId);
-
-    /**
-     * 批量删除公告信息
-     * 
-     * @param noticeIds 需要删除的公告ID
-     * @return 结果
-     */
-    public int deleteNoticeByIds(Long[] noticeIds);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysOperLogMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysOperLogMapper.java
deleted file mode 100644
index ff8fb80..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysOperLogMapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysOperLog;
-
-/**
- * 操作日志 数据层
- * 
- * @author djhk
- */
-public interface SysOperLogMapper
-{
-    /**
-     * 新增操作日志
-     * 
-     * @param operLog 操作日志对象
-     */
-    public void insertOperlog(SysOperLog operLog);
-
-    /**
-     * 查询系统操作日志集合
-     * 
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
-    /**
-     * 批量删除系统操作日志
-     * 
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    public int deleteOperLogByIds(Long[] operIds);
-
-    /**
-     * 查询操作日志详细
-     * 
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    public SysOperLog selectOperLogById(Long operId);
-
-    /**
-     * 清空操作日志
-     */
-    public void cleanOperLog();
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysPostMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysPostMapper.java
deleted file mode 100644
index b749b46..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysPostMapper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysPost;
-
-/**
- * 岗位信息 数据层
- * 
- * @author djhk
- */
-public interface SysPostMapper
-{
-    /**
-     * 查询岗位数据集合
-     * 
-     * @param post 岗位信息
-     * @return 岗位数据集合
-     */
-    public List<SysPost> selectPostList(SysPost post);
-
-    /**
-     * 查询所有岗位
-     * 
-     * @return 岗位列表
-     */
-    public List<SysPost> selectPostAll();
-
-    /**
-     * 通过岗位ID查询岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 角色对象信息
-     */
-    public SysPost selectPostById(Long postId);
-
-    /**
-     * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中岗位ID列表
-     */
-    public List<Long> selectPostListByUserId(Long userId);
-
-    /**
-     * 查询用户所属岗位组
-     * 
-     * @param userName 用户名
-     * @return 结果
-     */
-    public List<SysPost> selectPostsByUserName(String userName);
-
-    /**
-     * 删除岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int deletePostById(Long postId);
-
-    /**
-     * 批量删除岗位信息
-     * 
-     * @param postIds 需要删除的岗位ID
-     * @return 结果
-     */
-    public int deletePostByIds(Long[] postIds);
-
-    /**
-     * 修改岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int updatePost(SysPost post);
-
-    /**
-     * 新增岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int insertPost(SysPost post);
-
-    /**
-     * 校验岗位名称
-     * 
-     * @param postName 岗位名称
-     * @return 结果
-     */
-    public SysPost checkPostNameUnique(String postName);
-
-    /**
-     * 校验岗位编码
-     * 
-     * @param postCode 岗位编码
-     * @return 结果
-     */
-    public SysPost checkPostCodeUnique(String postCode);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleDeptMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleDeptMapper.java
deleted file mode 100644
index aa8ccd7..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleDeptMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysRoleDept;
-
-/**
- * 角色与部门关联表 数据层
- * 
- * @author djhk
- */
-public interface SysRoleDeptMapper
-{
-    /**
-     * 通过角色ID删除角色和部门关联
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int deleteRoleDeptByRoleId(Long roleId);
-
-    /**
-     * 批量删除角色部门关联信息
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteRoleDept(Long[] ids);
-
-    /**
-     * 查询部门使用数量
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int selectCountRoleDeptByDeptId(Long deptId);
-
-    /**
-     * 批量新增角色部门信息
-     * 
-     * @param roleDeptList 角色部门列表
-     * @return 结果
-     */
-    public int batchRoleDept(List<SysRoleDept> roleDeptList);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleMapper.java
deleted file mode 100644
index 9170a36..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleMapper.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.common.core.domain.entity.SysRole;
-
-/**
- * 角色表 数据层
- * 
- * @author djhk
- */
-public interface SysRoleMapper
-{
-    /**
-     * 根据条件分页查询角色数据
-     * 
-     * @param role 角色信息
-     * @return 角色数据集合信息
-     */
-    public List<SysRole> selectRoleList(SysRole role);
-
-    /**
-     * 根据用户ID查询角色
-     * 
-     * @param userId 用户ID
-     * @return 角色列表
-     */
-    public List<SysRole> selectRolePermissionByUserId(Long userId);
-
-    /**
-     * 查询所有角色
-     * 
-     * @return 角色列表
-     */
-    public List<SysRole> selectRoleAll();
-
-    /**
-     * 根据用户ID获取角色选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中角色ID列表
-     */
-    public List<Long> selectRoleListByUserId(Long userId);
-
-    /**
-     * 通过角色ID查询角色
-     * 
-     * @param roleId 角色ID
-     * @return 角色对象信息
-     */
-    public SysRole selectRoleById(Long roleId);
-
-    /**
-     * 根据用户ID查询角色
-     * 
-     * @param userName 用户名
-     * @return 角色列表
-     */
-    public List<SysRole> selectRolesByUserName(String userName);
-
-    /**
-     * 校验角色名称是否唯一
-     * 
-     * @param roleName 角色名称
-     * @return 角色信息
-     */
-    public SysRole checkRoleNameUnique(String roleName);
-
-    /**
-     * 校验角色权限是否唯一
-     * 
-     * @param roleKey 角色权限
-     * @return 角色信息
-     */
-    public SysRole checkRoleKeyUnique(String roleKey);
-
-    /**
-     * 修改角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int updateRole(SysRole role);
-
-    /**
-     * 新增角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int insertRole(SysRole role);
-
-    /**
-     * 通过角色ID删除角色
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int deleteRoleById(Long roleId);
-
-    /**
-     * 批量删除角色信息
-     * 
-     * @param roleIds 需要删除的角色ID
-     * @return 结果
-     */
-    public int deleteRoleByIds(Long[] roleIds);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleMenuMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleMenuMapper.java
deleted file mode 100644
index 6a4b447..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysRoleMenuMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysRoleMenu;
-
-/**
- * 角色与菜单关联表 数据层
- * 
- * @author djhk
- */
-public interface SysRoleMenuMapper
-{
-    /**
-     * 查询菜单使用数量
-     * 
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    public int checkMenuExistRole(Long menuId);
-
-    /**
-     * 通过角色ID删除角色和菜单关联
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int deleteRoleMenuByRoleId(Long roleId);
-
-    /**
-     * 批量删除角色菜单关联信息
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteRoleMenu(Long[] ids);
-
-    /**
-     * 批量新增角色菜单信息
-     * 
-     * @param roleMenuList 角色菜单列表
-     * @return 结果
-     */
-    public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysUserMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysUserMapper.java
deleted file mode 100644
index 602b36f..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysUserMapper.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.Date;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.djhk.common.core.domain.entity.SysUser;
-
-/**
- * 用户表 数据层
- * 
- * @author djhk
- */
-public interface SysUserMapper
-{
-    /**
-     * 根据条件分页查询用户列表
-     * 
-     * @param sysUser 用户信息
-     * @return 用户信息集合信息
-     */
-    public List<SysUser> selectUserList(SysUser sysUser);
-
-    /**
-     * 根据条件分页查询已配用户角色列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    public List<SysUser> selectAllocatedList(SysUser user);
-
-    /**
-     * 根据条件分页查询未分配用户角色列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    public List<SysUser> selectUnallocatedList(SysUser user);
-
-    /**
-     * 通过用户名查询用户
-     * 
-     * @param userName 用户名
-     * @return 用户对象信息
-     */
-    public SysUser selectUserByUserName(String userName);
-
-    /**
-     * 通过用户ID查询用户
-     * 
-     * @param userId 用户ID
-     * @return 用户对象信息
-     */
-    public SysUser selectUserById(Long userId);
-
-    /**
-     * 新增用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int insertUser(SysUser user);
-
-    /**
-     * 修改用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int updateUser(SysUser user);
-
-    /**
-     * 修改用户头像
-     * 
-     * @param userId 用户ID
-     * @param avatar 头像地址
-     * @return 结果
-     */
-    public int updateUserAvatar(@Param("userId") Long userId, @Param("avatar") String avatar);
-
-    /**
-     * 修改用户状态
-     * 
-     * @param userId 用户ID
-     * @param status 状态
-     * @return 结果
-     */
-    public int updateUserStatus(@Param("userId") Long userId, @Param("status") String status);
-
-    /**
-     * 更新用户登录信息（IP和登录时间）
-     * 
-     * @param userId 用户ID
-     * @param loginIp 登录IP地址
-     * @param loginDate 登录时间
-     * @return 结果
-     */
-    public int updateLoginInfo(@Param("userId") Long userId, @Param("loginIp") String loginIp, @Param("loginDate") Date loginDate);
-
-    /**
-     * 重置用户密码
-     * 
-     * @param userId 用户ID
-     * @param password 密码
-     * @return 结果
-     */
-    public int resetUserPwd(@Param("userId") Long userId, @Param("password") String password);
-
-    /**
-     * 通过用户ID删除用户
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserById(Long userId);
-
-    /**
-     * 批量删除用户信息
-     * 
-     * @param userIds 需要删除的用户ID
-     * @return 结果
-     */
-    public int deleteUserByIds(Long[] userIds);
-
-    /**
-     * 校验用户名称是否唯一
-     * 
-     * @param userName 用户名称
-     * @return 结果
-     */
-    public SysUser checkUserNameUnique(String userName);
-
-    /**
-     * 校验手机号码是否唯一
-     *
-     * @param phonenumber 手机号码
-     * @return 结果
-     */
-    public SysUser checkPhoneUnique(String phonenumber);
-
-    /**
-     * 校验email是否唯一
-     *
-     * @param email 用户邮箱
-     * @return 结果
-     */
-    public SysUser checkEmailUnique(String email);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysUserPostMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysUserPostMapper.java
deleted file mode 100644
index 8c1f082..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysUserPostMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import com.djhk.system.domain.SysUserPost;
-
-/**
- * 用户与岗位关联表 数据层
- * 
- * @author djhk
- */
-public interface SysUserPostMapper
-{
-    /**
-     * 通过用户ID删除用户和岗位关联
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserPostByUserId(Long userId);
-
-    /**
-     * 通过岗位ID查询岗位使用数量
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int countUserPostById(Long postId);
-
-    /**
-     * 批量删除用户和岗位关联
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteUserPost(Long[] ids);
-
-    /**
-     * 批量新增用户岗位信息
-     * 
-     * @param userPostList 用户岗位列表
-     * @return 结果
-     */
-    public int batchUserPost(List<SysUserPost> userPostList);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/mapper/SysUserRoleMapper.java b/djhk-system/src/main/java/com/djhk/system/mapper/SysUserRoleMapper.java
deleted file mode 100644
index d122d14..0000000
--- a/djhk-system/src/main/java/com/djhk/system/mapper/SysUserRoleMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.djhk.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.djhk.system.domain.SysUserRole;
-
-/**
- * 用户与角色关联表 数据层
- * 
- * @author djhk
- */
-public interface SysUserRoleMapper
-{
-    /**
-     * 通过用户ID删除用户和角色关联
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserRoleByUserId(Long userId);
-
-    /**
-     * 批量删除用户和角色关联
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteUserRole(Long[] ids);
-
-    /**
-     * 通过角色ID查询角色使用数量
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int countUserRoleByRoleId(Long roleId);
-
-    /**
-     * 批量新增用户角色信息
-     * 
-     * @param userRoleList 用户角色列表
-     * @return 结果
-     */
-    public int batchUserRole(List<SysUserRole> userRoleList);
-
-    /**
-     * 删除用户和角色关联信息
-     * 
-     * @param userRole 用户和角色关联信息
-     * @return 结果
-     */
-    public int deleteUserRoleInfo(SysUserRole userRole);
-
-    /**
-     * 批量取消授权用户角色
-     * 
-     * @param roleId 角色ID
-     * @param userIds 需要删除的用户数据ID
-     * @return 结果
-     */
-    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysConfigService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysConfigService.java
deleted file mode 100644
index b3b6a6d..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysConfigService.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.system.domain.SysConfig;
-
-/**
- * 参数配置 服务层
- * 
- * @author djhk
- */
-public interface ISysConfigService
-{
-    /**
-     * 查询参数配置信息
-     * 
-     * @param configId 参数配置ID
-     * @return 参数配置信息
-     */
-    public SysConfig selectConfigById(Long configId);
-
-    /**
-     * 根据键名查询参数配置信息
-     * 
-     * @param configKey 参数键名
-     * @return 参数键值
-     */
-    public String selectConfigByKey(String configKey);
-
-    /**
-     * 获取验证码开关
-     * 
-     * @return true开启，false关闭
-     */
-    public boolean selectCaptchaEnabled();
-
-    /**
-     * 查询参数配置列表
-     * 
-     * @param config 参数配置信息
-     * @return 参数配置集合
-     */
-    public List<SysConfig> selectConfigList(SysConfig config);
-
-    /**
-     * 新增参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    public int insertConfig(SysConfig config);
-
-    /**
-     * 修改参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    public int updateConfig(SysConfig config);
-
-    /**
-     * 批量删除参数信息
-     * 
-     * @param configIds 需要删除的参数ID
-     */
-    public void deleteConfigByIds(Long[] configIds);
-
-    /**
-     * 加载参数缓存数据
-     */
-    public void loadingConfigCache();
-
-    /**
-     * 清空参数缓存数据
-     */
-    public void clearConfigCache();
-
-    /**
-     * 重置参数缓存数据
-     */
-    public void resetConfigCache();
-
-    /**
-     * 校验参数键名是否唯一
-     * 
-     * @param config 参数信息
-     * @return 结果
-     */
-    public boolean checkConfigKeyUnique(SysConfig config);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysDeptService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysDeptService.java
deleted file mode 100644
index 5bda2e3..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysDeptService.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.common.core.domain.TreeSelect;
-import com.djhk.common.core.domain.entity.SysDept;
-
-/**
- * 部门管理 服务层
- * 
- * @author djhk
- */
-public interface ISysDeptService
-{
-    /**
-     * 查询部门管理数据
-     * 
-     * @param dept 部门信息
-     * @return 部门信息集合
-     */
-    public List<SysDept> selectDeptList(SysDept dept);
-
-    /**
-     * 查询部门树结构信息
-     * 
-     * @param dept 部门信息
-     * @return 部门树信息集合
-     */
-    public List<TreeSelect> selectDeptTreeList(SysDept dept);
-
-    /**
-     * 构建前端所需要树结构
-     * 
-     * @param depts 部门列表
-     * @return 树结构列表
-     */
-    public List<SysDept> buildDeptTree(List<SysDept> depts);
-
-    /**
-     * 构建前端所需要下拉树结构
-     * 
-     * @param depts 部门列表
-     * @return 下拉树结构列表
-     */
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
-
-    /**
-     * 根据角色ID查询部门树信息
-     * 
-     * @param roleId 角色ID
-     * @return 选中部门列表
-     */
-    public List<Long> selectDeptListByRoleId(Long roleId);
-
-    /**
-     * 根据部门ID查询信息
-     * 
-     * @param deptId 部门ID
-     * @return 部门信息
-     */
-    public SysDept selectDeptById(Long deptId);
-
-    /**
-     * 根据ID查询所有子部门（正常状态）
-     * 
-     * @param deptId 部门ID
-     * @return 子部门数
-     */
-    public int selectNormalChildrenDeptById(Long deptId);
-
-    /**
-     * 是否存在部门子节点
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public boolean hasChildByDeptId(Long deptId);
-
-    /**
-     * 查询部门是否存在用户
-     * 
-     * @param deptId 部门ID
-     * @return 结果 true 存在 false 不存在
-     */
-    public boolean checkDeptExistUser(Long deptId);
-
-    /**
-     * 校验部门名称是否唯一
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    public boolean checkDeptNameUnique(SysDept dept);
-
-    /**
-     * 校验部门是否有数据权限
-     * 
-     * @param deptId 部门id
-     */
-    public void checkDeptDataScope(Long deptId);
-
-    /**
-     * 新增保存部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    public int insertDept(SysDept dept);
-
-    /**
-     * 修改保存部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    public int updateDept(SysDept dept);
-
-    /**
-     * 删除部门管理信息
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int deleteDeptById(Long deptId);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysDictDataService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysDictDataService.java
deleted file mode 100644
index 98594f0..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysDictDataService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.common.core.domain.entity.SysDictData;
-
-/**
- * 字典 业务层
- * 
- * @author djhk
- */
-public interface ISysDictDataService
-{
-    /**
-     * 根据条件分页查询字典数据
-     * 
-     * @param dictData 字典数据信息
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataList(SysDictData dictData);
-
-    /**
-     * 根据字典类型和字典键值查询字典数据信息
-     * 
-     * @param dictType 字典类型
-     * @param dictValue 字典键值
-     * @return 字典标签
-     */
-    public String selectDictLabel(String dictType, String dictValue);
-
-    /**
-     * 根据字典数据ID查询信息
-     * 
-     * @param dictCode 字典数据ID
-     * @return 字典数据
-     */
-    public SysDictData selectDictDataById(Long dictCode);
-
-    /**
-     * 批量删除字典数据信息
-     * 
-     * @param dictCodes 需要删除的字典数据ID
-     */
-    public void deleteDictDataByIds(Long[] dictCodes);
-
-    /**
-     * 新增保存字典数据信息
-     * 
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int insertDictData(SysDictData dictData);
-
-    /**
-     * 修改保存字典数据信息
-     * 
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int updateDictData(SysDictData dictData);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysDictTypeService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysDictTypeService.java
deleted file mode 100644
index 74ed0ee..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysDictTypeService.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.common.core.domain.entity.SysDictData;
-import com.djhk.common.core.domain.entity.SysDictType;
-
-/**
- * 字典 业务层
- * 
- * @author djhk
- */
-public interface ISysDictTypeService
-{
-    /**
-     * 根据条件分页查询字典类型
-     * 
-     * @param dictType 字典类型信息
-     * @return 字典类型集合信息
-     */
-    public List<SysDictType> selectDictTypeList(SysDictType dictType);
-
-    /**
-     * 根据所有字典类型
-     * 
-     * @return 字典类型集合信息
-     */
-    public List<SysDictType> selectDictTypeAll();
-
-    /**
-     * 根据字典类型查询字典数据
-     * 
-     * @param dictType 字典类型
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataByType(String dictType);
-
-    /**
-     * 根据字典类型ID查询信息
-     * 
-     * @param dictId 字典类型ID
-     * @return 字典类型
-     */
-    public SysDictType selectDictTypeById(Long dictId);
-
-    /**
-     * 根据字典类型查询信息
-     * 
-     * @param dictType 字典类型
-     * @return 字典类型
-     */
-    public SysDictType selectDictTypeByType(String dictType);
-
-    /**
-     * 批量删除字典信息
-     * 
-     * @param dictIds 需要删除的字典ID
-     */
-    public void deleteDictTypeByIds(Long[] dictIds);
-
-    /**
-     * 加载字典缓存数据
-     */
-    public void loadingDictCache();
-
-    /**
-     * 清空字典缓存数据
-     */
-    public void clearDictCache();
-
-    /**
-     * 重置字典缓存数据
-     */
-    public void resetDictCache();
-
-    /**
-     * 新增保存字典类型信息
-     * 
-     * @param dictType 字典类型信息
-     * @return 结果
-     */
-    public int insertDictType(SysDictType dictType);
-
-    /**
-     * 修改保存字典类型信息
-     * 
-     * @param dictType 字典类型信息
-     * @return 结果
-     */
-    public int updateDictType(SysDictType dictType);
-
-    /**
-     * 校验字典类型称是否唯一
-     * 
-     * @param dictType 字典类型
-     * @return 结果
-     */
-    public boolean checkDictTypeUnique(SysDictType dictType);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysLogininforService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysLogininforService.java
deleted file mode 100644
index 42e9778..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysLogininforService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.system.domain.SysLogininfor;
-
-/**
- * 系统访问日志情况信息 服务层
- * 
- * @author djhk
- */
-public interface ISysLogininforService
-{
-    /**
-     * 新增系统登录日志
-     * 
-     * @param logininfor 访问日志对象
-     */
-    public void insertLogininfor(SysLogininfor logininfor);
-
-    /**
-     * 查询系统登录日志集合
-     * 
-     * @param logininfor 访问日志对象
-     * @return 登录记录集合
-     */
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
-
-    /**
-     * 批量删除系统登录日志
-     * 
-     * @param infoIds 需要删除的登录日志ID
-     * @return 结果
-     */
-    public int deleteLogininforByIds(Long[] infoIds);
-
-    /**
-     * 清空系统登录日志
-     */
-    public void cleanLogininfor();
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysMenuService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysMenuService.java
deleted file mode 100644
index 538fdc5..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysMenuService.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import java.util.Set;
-import com.djhk.common.core.domain.TreeSelect;
-import com.djhk.common.core.domain.entity.SysMenu;
-import com.djhk.system.domain.vo.RouterVo;
-
-/**
- * 菜单 业务层
- * 
- * @author djhk
- */
-public interface ISysMenuService
-{
-    /**
-     * 根据用户查询系统菜单列表
-     * 
-     * @param userId 用户ID
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuList(Long userId);
-
-    /**
-     * 根据用户查询系统菜单列表
-     * 
-     * @param menu 菜单信息
-     * @param userId 用户ID
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
-
-    /**
-     * 根据用户ID查询权限
-     * 
-     * @param userId 用户ID
-     * @return 权限列表
-     */
-    public Set<String> selectMenuPermsByUserId(Long userId);
-
-    /**
-     * 根据角色ID查询权限
-     * 
-     * @param roleId 角色ID
-     * @return 权限列表
-     */
-    public Set<String> selectMenuPermsByRoleId(Long roleId);
-
-    /**
-     * 根据用户ID查询菜单树信息
-     * 
-     * @param userId 用户ID
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
-
-    /**
-     * 根据角色ID查询菜单树信息
-     * 
-     * @param roleId 角色ID
-     * @return 选中菜单列表
-     */
-    public List<Long> selectMenuListByRoleId(Long roleId);
-
-    /**
-     * 构建前端路由所需要的菜单
-     * 
-     * @param menus 菜单列表
-     * @return 路由列表
-     */
-    public List<RouterVo> buildMenus(List<SysMenu> menus);
-
-    /**
-     * 构建前端所需要树结构
-     * 
-     * @param menus 菜单列表
-     * @return 树结构列表
-     */
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus);
-
-    /**
-     * 构建前端所需要下拉树结构
-     * 
-     * @param menus 菜单列表
-     * @return 下拉树结构列表
-     */
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
-
-    /**
-     * 根据菜单ID查询信息
-     * 
-     * @param menuId 菜单ID
-     * @return 菜单信息
-     */
-    public SysMenu selectMenuById(Long menuId);
-
-    /**
-     * 是否存在菜单子节点
-     * 
-     * @param menuId 菜单ID
-     * @return 结果 true 存在 false 不存在
-     */
-    public boolean hasChildByMenuId(Long menuId);
-
-    /**
-     * 查询菜单是否存在角色
-     * 
-     * @param menuId 菜单ID
-     * @return 结果 true 存在 false 不存在
-     */
-    public boolean checkMenuExistRole(Long menuId);
-
-    /**
-     * 新增保存菜单信息
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public int insertMenu(SysMenu menu);
-
-    /**
-     * 修改保存菜单信息
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public int updateMenu(SysMenu menu);
-
-    /**
-     * 删除菜单管理信息
-     * 
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    public int deleteMenuById(Long menuId);
-
-    /**
-     * 校验菜单名称是否唯一
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public boolean checkMenuNameUnique(SysMenu menu);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysNoticeService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysNoticeService.java
deleted file mode 100644
index 8e189b2..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysNoticeService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.system.domain.SysNotice;
-
-/**
- * 公告 服务层
- * 
- * @author djhk
- */
-public interface ISysNoticeService
-{
-    /**
-     * 查询公告信息
-     * 
-     * @param noticeId 公告ID
-     * @return 公告信息
-     */
-    public SysNotice selectNoticeById(Long noticeId);
-
-    /**
-     * 查询公告列表
-     * 
-     * @param notice 公告信息
-     * @return 公告集合
-     */
-    public List<SysNotice> selectNoticeList(SysNotice notice);
-
-    /**
-     * 新增公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    public int insertNotice(SysNotice notice);
-
-    /**
-     * 修改公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    public int updateNotice(SysNotice notice);
-
-    /**
-     * 删除公告信息
-     * 
-     * @param noticeId 公告ID
-     * @return 结果
-     */
-    public int deleteNoticeById(Long noticeId);
-    
-    /**
-     * 批量删除公告信息
-     * 
-     * @param noticeIds 需要删除的公告ID
-     * @return 结果
-     */
-    public int deleteNoticeByIds(Long[] noticeIds);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysOperLogService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysOperLogService.java
deleted file mode 100644
index 3bf0869..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysOperLogService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.system.domain.SysOperLog;
-
-/**
- * 操作日志 服务层
- * 
- * @author djhk
- */
-public interface ISysOperLogService
-{
-    /**
-     * 新增操作日志
-     * 
-     * @param operLog 操作日志对象
-     */
-    public void insertOperlog(SysOperLog operLog);
-
-    /**
-     * 查询系统操作日志集合
-     * 
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
-    /**
-     * 批量删除系统操作日志
-     * 
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    public int deleteOperLogByIds(Long[] operIds);
-
-    /**
-     * 查询操作日志详细
-     * 
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    public SysOperLog selectOperLogById(Long operId);
-
-    /**
-     * 清空操作日志
-     */
-    public void cleanOperLog();
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysPostService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysPostService.java
deleted file mode 100644
index 9bd84f9..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysPostService.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import com.djhk.system.domain.SysPost;
-
-/**
- * 岗位信息 服务层
- * 
- * @author djhk
- */
-public interface ISysPostService
-{
-    /**
-     * 查询岗位信息集合
-     * 
-     * @param post 岗位信息
-     * @return 岗位列表
-     */
-    public List<SysPost> selectPostList(SysPost post);
-
-    /**
-     * 查询所有岗位
-     * 
-     * @return 岗位列表
-     */
-    public List<SysPost> selectPostAll();
-
-    /**
-     * 通过岗位ID查询岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 角色对象信息
-     */
-    public SysPost selectPostById(Long postId);
-
-    /**
-     * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中岗位ID列表
-     */
-    public List<Long> selectPostListByUserId(Long userId);
-
-    /**
-     * 校验岗位名称
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public boolean checkPostNameUnique(SysPost post);
-
-    /**
-     * 校验岗位编码
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public boolean checkPostCodeUnique(SysPost post);
-
-    /**
-     * 通过岗位ID查询岗位使用数量
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int countUserPostById(Long postId);
-
-    /**
-     * 删除岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int deletePostById(Long postId);
-
-    /**
-     * 批量删除岗位信息
-     * 
-     * @param postIds 需要删除的岗位ID
-     * @return 结果
-     */
-    public int deletePostByIds(Long[] postIds);
-
-    /**
-     * 新增保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int insertPost(SysPost post);
-
-    /**
-     * 修改保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int updatePost(SysPost post);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysRoleService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysRoleService.java
deleted file mode 100644
index 7c039b1..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysRoleService.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.List;
-import java.util.Set;
-import com.djhk.common.core.domain.entity.SysRole;
-import com.djhk.system.domain.SysUserRole;
-
-/**
- * 角色业务层
- * 
- * @author djhk
- */
-public interface ISysRoleService
-{
-    /**
-     * 根据条件分页查询角色数据
-     * 
-     * @param role 角色信息
-     * @return 角色数据集合信息
-     */
-    public List<SysRole> selectRoleList(SysRole role);
-
-    /**
-     * 根据用户ID查询角色列表
-     * 
-     * @param userId 用户ID
-     * @return 角色列表
-     */
-    public List<SysRole> selectRolesByUserId(Long userId);
-
-    /**
-     * 根据用户ID查询角色权限
-     * 
-     * @param userId 用户ID
-     * @return 权限列表
-     */
-    public Set<String> selectRolePermissionByUserId(Long userId);
-
-    /**
-     * 查询所有角色
-     * 
-     * @return 角色列表
-     */
-    public List<SysRole> selectRoleAll();
-
-    /**
-     * 根据用户ID获取角色选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中角色ID列表
-     */
-    public List<Long> selectRoleListByUserId(Long userId);
-
-    /**
-     * 通过角色ID查询角色
-     * 
-     * @param roleId 角色ID
-     * @return 角色对象信息
-     */
-    public SysRole selectRoleById(Long roleId);
-
-    /**
-     * 校验角色名称是否唯一
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public boolean checkRoleNameUnique(SysRole role);
-
-    /**
-     * 校验角色权限是否唯一
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public boolean checkRoleKeyUnique(SysRole role);
-
-    /**
-     * 校验角色是否允许操作
-     * 
-     * @param role 角色信息
-     */
-    public void checkRoleAllowed(SysRole role);
-
-    /**
-     * 校验角色是否有数据权限
-     * 
-     * @param roleIds 角色id
-     */
-    public void checkRoleDataScope(Long... roleIds);
-
-    /**
-     * 通过角色ID查询角色使用数量
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int countUserRoleByRoleId(Long roleId);
-
-    /**
-     * 新增保存角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int insertRole(SysRole role);
-
-    /**
-     * 修改保存角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int updateRole(SysRole role);
-
-    /**
-     * 修改角色状态
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int updateRoleStatus(SysRole role);
-
-    /**
-     * 修改数据权限信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int authDataScope(SysRole role);
-
-    /**
-     * 通过角色ID删除角色
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int deleteRoleById(Long roleId);
-
-    /**
-     * 批量删除角色信息
-     * 
-     * @param roleIds 需要删除的角色ID
-     * @return 结果
-     */
-    public int deleteRoleByIds(Long[] roleIds);
-
-    /**
-     * 取消授权用户角色
-     * 
-     * @param userRole 用户和角色关联信息
-     * @return 结果
-     */
-    public int deleteAuthUser(SysUserRole userRole);
-
-    /**
-     * 批量取消授权用户角色
-     * 
-     * @param roleId 角色ID
-     * @param userIds 需要取消授权的用户数据ID
-     * @return 结果
-     */
-    public int deleteAuthUsers(Long roleId, Long[] userIds);
-
-    /**
-     * 批量选择授权用户角色
-     * 
-     * @param roleId 角色ID
-     * @param userIds 需要删除的用户数据ID
-     * @return 结果
-     */
-    public int insertAuthUsers(Long roleId, Long[] userIds);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysUserOnlineService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysUserOnlineService.java
deleted file mode 100644
index 863ed27..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysUserOnlineService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.djhk.system.service;
-
-import com.djhk.common.core.domain.model.LoginUser;
-import com.djhk.system.domain.SysUserOnline;
-
-/**
- * 在线用户 服务层
- * 
- * @author djhk
- */
-public interface ISysUserOnlineService
-{
-    /**
-     * 通过登录地址查询信息
-     * 
-     * @param ipaddr 登录地址
-     * @param user 用户信息
-     * @return 在线用户信息
-     */
-    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
-
-    /**
-     * 通过用户名称查询信息
-     * 
-     * @param userName 用户名称
-     * @param user 用户信息
-     * @return 在线用户信息
-     */
-    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
-
-    /**
-     * 通过登录地址/用户名称查询信息
-     * 
-     * @param ipaddr 登录地址
-     * @param userName 用户名称
-     * @param user 用户信息
-     * @return 在线用户信息
-     */
-    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);
-
-    /**
-     * 设置在线用户信息
-     * 
-     * @param user 用户信息
-     * @return 在线用户
-     */
-    public SysUserOnline loginUserToUserOnline(LoginUser user);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/ISysUserService.java b/djhk-system/src/main/java/com/djhk/system/service/ISysUserService.java
deleted file mode 100644
index 342497c..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/ISysUserService.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.djhk.system.service;
-
-import java.util.Date;
-import java.util.List;
-import com.djhk.common.core.domain.entity.SysUser;
-
-/**
- * 用户 业务层
- * 
- * @author djhk
- */
-public interface ISysUserService
-{
-    /**
-     * 根据条件分页查询用户列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    public List<SysUser> selectUserList(SysUser user);
-
-    /**
-     * 根据条件分页查询已分配用户角色列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    public List<SysUser> selectAllocatedList(SysUser user);
-
-    /**
-     * 根据条件分页查询未分配用户角色列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    public List<SysUser> selectUnallocatedList(SysUser user);
-
-    /**
-     * 通过用户名查询用户
-     * 
-     * @param userName 用户名
-     * @return 用户对象信息
-     */
-    public SysUser selectUserByUserName(String userName);
-
-    /**
-     * 通过用户ID查询用户
-     * 
-     * @param userId 用户ID
-     * @return 用户对象信息
-     */
-    public SysUser selectUserById(Long userId);
-
-    /**
-     * 根据用户ID查询用户所属角色组
-     * 
-     * @param userName 用户名
-     * @return 结果
-     */
-    public String selectUserRoleGroup(String userName);
-
-    /**
-     * 根据用户ID查询用户所属岗位组
-     * 
-     * @param userName 用户名
-     * @return 结果
-     */
-    public String selectUserPostGroup(String userName);
-
-    /**
-     * 校验用户名称是否唯一
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public boolean checkUserNameUnique(SysUser user);
-
-    /**
-     * 校验手机号码是否唯一
-     *
-     * @param user 用户信息
-     * @return 结果
-     */
-    public boolean checkPhoneUnique(SysUser user);
-
-    /**
-     * 校验email是否唯一
-     *
-     * @param user 用户信息
-     * @return 结果
-     */
-    public boolean checkEmailUnique(SysUser user);
-
-    /**
-     * 校验用户是否允许操作
-     * 
-     * @param user 用户信息
-     */
-    public void checkUserAllowed(SysUser user);
-
-    /**
-     * 校验用户是否有数据权限
-     * 
-     * @param userId 用户id
-     */
-    public void checkUserDataScope(Long userId);
-
-    /**
-     * 新增用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int insertUser(SysUser user);
-
-    /**
-     * 注册用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public boolean registerUser(SysUser user);
-
-    /**
-     * 修改用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int updateUser(SysUser user);
-
-    /**
-     * 用户授权角色
-     * 
-     * @param userId 用户ID
-     * @param roleIds 角色组
-     */
-    public void insertUserAuth(Long userId, Long[] roleIds);
-
-    /**
-     * 修改用户状态
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int updateUserStatus(SysUser user);
-
-    /**
-     * 修改用户基本信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int updateUserProfile(SysUser user);
-
-    /**
-     * 修改用户头像
-     * 
-     * @param userId 用户ID
-     * @param avatar 头像地址
-     * @return 结果
-     */
-    public boolean updateUserAvatar(Long userId, String avatar);
-
-    /**
-     * 更新用户登录信息（IP和登录时间）
-     * 
-     * @param userId 用户ID
-     * @param loginIp 登录IP地址
-     * @param loginDate 登录时间
-     * @return 结果
-     */
-    public void updateLoginInfo(Long userId, String loginIp, Date loginDate);
-
-    /**
-     * 重置用户密码
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int resetPwd(SysUser user);
-
-    /**
-     * 重置用户密码
-     * 
-     * @param userId 用户ID
-     * @param password 密码
-     * @return 结果
-     */
-    public int resetUserPwd(Long userId, String password);
-
-    /**
-     * 通过用户ID删除用户
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserById(Long userId);
-
-    /**
-     * 批量删除用户信息
-     * 
-     * @param userIds 需要删除的用户ID
-     * @return 结果
-     */
-    public int deleteUserByIds(Long[] userIds);
-
-    /**
-     * 导入用户数据
-     * 
-     * @param userList 用户数据列表
-     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName 操作用户
-     * @return 结果
-     */
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysConfigServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysConfigServiceImpl.java
deleted file mode 100644
index e463e8f..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysConfigServiceImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.Collection;
-import java.util.List;
-import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.common.annotation.DataSource;
-import com.djhk.common.constant.CacheConstants;
-import com.djhk.common.constant.UserConstants;
-import com.djhk.common.core.redis.RedisCache;
-import com.djhk.common.core.text.Convert;
-import com.djhk.common.enums.DataSourceType;
-import com.djhk.common.exception.ServiceException;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.system.domain.SysConfig;
-import com.djhk.system.mapper.SysConfigMapper;
-import com.djhk.system.service.ISysConfigService;
-
-/**
- * 参数配置 服务层实现
- * 
- * @author djhk
- */
-@Service
-public class SysConfigServiceImpl implements ISysConfigService
-{
-    @Autowired
-    private SysConfigMapper configMapper;
-
-    @Autowired
-    private RedisCache redisCache;
-
-    /**
-     * 项目启动时，初始化参数到缓存
-     */
-    @PostConstruct
-    public void init()
-    {
-        loadingConfigCache();
-    }
-
-    /**
-     * 查询参数配置信息
-     * 
-     * @param configId 参数配置ID
-     * @return 参数配置信息
-     */
-    @Override
-    @DataSource(DataSourceType.MASTER)
-    public SysConfig selectConfigById(Long configId)
-    {
-        SysConfig config = new SysConfig();
-        config.setConfigId(configId);
-        return configMapper.selectConfig(config);
-    }
-
-    /**
-     * 根据键名查询参数配置信息
-     * 
-     * @param configKey 参数key
-     * @return 参数键值
-     */
-    @Override
-    public String selectConfigByKey(String configKey)
-    {
-        String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
-        if (StringUtils.isNotEmpty(configValue))
-        {
-            return configValue;
-        }
-        SysConfig config = new SysConfig();
-        config.setConfigKey(configKey);
-        SysConfig retConfig = configMapper.selectConfig(config);
-        if (StringUtils.isNotNull(retConfig))
-        {
-            redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
-            return retConfig.getConfigValue();
-        }
-        return StringUtils.EMPTY;
-    }
-
-    /**
-     * 获取验证码开关
-     * 
-     * @return true开启，false关闭
-     */
-    @Override
-    public boolean selectCaptchaEnabled()
-    {
-        String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled");
-        if (StringUtils.isEmpty(captchaEnabled))
-        {
-            return true;
-        }
-        return Convert.toBool(captchaEnabled);
-    }
-
-    /**
-     * 查询参数配置列表
-     * 
-     * @param config 参数配置信息
-     * @return 参数配置集合
-     */
-    @Override
-    public List<SysConfig> selectConfigList(SysConfig config)
-    {
-        return configMapper.selectConfigList(config);
-    }
-
-    /**
-     * 新增参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    @Override
-    public int insertConfig(SysConfig config)
-    {
-        int row = configMapper.insertConfig(config);
-        if (row > 0)
-        {
-            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
-        }
-        return row;
-    }
-
-    /**
-     * 修改参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    @Override
-    public int updateConfig(SysConfig config)
-    {
-        SysConfig temp = configMapper.selectConfigById(config.getConfigId());
-        if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey()))
-        {
-            redisCache.deleteObject(getCacheKey(temp.getConfigKey()));
-        }
-
-        int row = configMapper.updateConfig(config);
-        if (row > 0)
-        {
-            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
-        }
-        return row;
-    }
-
-    /**
-     * 批量删除参数信息
-     * 
-     * @param configIds 需要删除的参数ID
-     */
-    @Override
-    public void deleteConfigByIds(Long[] configIds)
-    {
-        for (Long configId : configIds)
-        {
-            SysConfig config = selectConfigById(configId);
-            if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
-            {
-                throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
-            }
-            configMapper.deleteConfigById(configId);
-            redisCache.deleteObject(getCacheKey(config.getConfigKey()));
-        }
-    }
-
-    /**
-     * 加载参数缓存数据
-     */
-    @Override
-    public void loadingConfigCache()
-    {
-        List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
-        for (SysConfig config : configsList)
-        {
-            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
-        }
-    }
-
-    /**
-     * 清空参数缓存数据
-     */
-    @Override
-    public void clearConfigCache()
-    {
-        Collection<String> keys = redisCache.keys(CacheConstants.SYS_CONFIG_KEY + "*");
-        redisCache.deleteObject(keys);
-    }
-
-    /**
-     * 重置参数缓存数据
-     */
-    @Override
-    public void resetConfigCache()
-    {
-        clearConfigCache();
-        loadingConfigCache();
-    }
-
-    /**
-     * 校验参数键名是否唯一
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkConfigKeyUnique(SysConfig config)
-    {
-        Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
-        SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
-        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 设置cache key
-     * 
-     * @param configKey 参数键
-     * @return 缓存键key
-     */
-    private String getCacheKey(String configKey)
-    {
-        return CacheConstants.SYS_CONFIG_KEY + configKey;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysDeptServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysDeptServiceImpl.java
deleted file mode 100644
index c8770ba..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysDeptServiceImpl.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.common.annotation.DataScope;
-import com.djhk.common.constant.UserConstants;
-import com.djhk.common.core.domain.TreeSelect;
-import com.djhk.common.core.domain.entity.SysDept;
-import com.djhk.common.core.domain.entity.SysRole;
-import com.djhk.common.core.domain.entity.SysUser;
-import com.djhk.common.core.text.Convert;
-import com.djhk.common.exception.ServiceException;
-import com.djhk.common.utils.SecurityUtils;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.common.utils.spring.SpringUtils;
-import com.djhk.system.mapper.SysDeptMapper;
-import com.djhk.system.mapper.SysRoleMapper;
-import com.djhk.system.service.ISysDeptService;
-
-/**
- * 部门管理 服务实现
- * 
- * @author djhk
- */
-@Service
-public class SysDeptServiceImpl implements ISysDeptService
-{
-    @Autowired
-    private SysDeptMapper deptMapper;
-
-    @Autowired
-    private SysRoleMapper roleMapper;
-
-    /**
-     * 查询部门管理数据
-     * 
-     * @param dept 部门信息
-     * @return 部门信息集合
-     */
-    @Override
-    @DataScope(deptAlias = "d")
-    public List<SysDept> selectDeptList(SysDept dept)
-    {
-        return deptMapper.selectDeptList(dept);
-    }
-
-    /**
-     * 查询部门树结构信息
-     * 
-     * @param dept 部门信息
-     * @return 部门树信息集合
-     */
-    @Override
-    public List<TreeSelect> selectDeptTreeList(SysDept dept)
-    {
-        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
-        return buildDeptTreeSelect(depts);
-    }
-
-    /**
-     * 构建前端所需要树结构
-     * 
-     * @param depts 部门列表
-     * @return 树结构列表
-     */
-    @Override
-    public List<SysDept> buildDeptTree(List<SysDept> depts)
-    {
-        List<SysDept> returnList = new ArrayList<SysDept>();
-        List<Long> tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-        for (SysDept dept : depts)
-        {
-            // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(dept.getParentId()))
-            {
-                recursionFn(depts, dept);
-                returnList.add(dept);
-            }
-        }
-        if (returnList.isEmpty())
-        {
-            returnList = depts;
-        }
-        return returnList;
-    }
-
-    /**
-     * 构建前端所需要下拉树结构
-     * 
-     * @param depts 部门列表
-     * @return 下拉树结构列表
-     */
-    @Override
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts)
-    {
-        List<SysDept> deptTrees = buildDeptTree(depts);
-        return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
-    }
-
-    /**
-     * 根据角色ID查询部门树信息
-     * 
-     * @param roleId 角色ID
-     * @return 选中部门列表
-     */
-    @Override
-    public List<Long> selectDeptListByRoleId(Long roleId)
-    {
-        SysRole role = roleMapper.selectRoleById(roleId);
-        return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
-    }
-
-    /**
-     * 根据部门ID查询信息
-     * 
-     * @param deptId 部门ID
-     * @return 部门信息
-     */
-    @Override
-    public SysDept selectDeptById(Long deptId)
-    {
-        return deptMapper.selectDeptById(deptId);
-    }
-
-    /**
-     * 根据ID查询所有子部门（正常状态）
-     * 
-     * @param deptId 部门ID
-     * @return 子部门数
-     */
-    @Override
-    public int selectNormalChildrenDeptById(Long deptId)
-    {
-        return deptMapper.selectNormalChildrenDeptById(deptId);
-    }
-
-    /**
-     * 是否存在子节点
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    @Override
-    public boolean hasChildByDeptId(Long deptId)
-    {
-        int result = deptMapper.hasChildByDeptId(deptId);
-        return result > 0;
-    }
-
-    /**
-     * 查询部门是否存在用户
-     * 
-     * @param deptId 部门ID
-     * @return 结果 true 存在 false 不存在
-     */
-    @Override
-    public boolean checkDeptExistUser(Long deptId)
-    {
-        int result = deptMapper.checkDeptExistUser(deptId);
-        return result > 0;
-    }
-
-    /**
-     * 校验部门名称是否唯一
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkDeptNameUnique(SysDept dept)
-    {
-        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
-        SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
-        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验部门是否有数据权限
-     * 
-     * @param deptId 部门id
-     */
-    @Override
-    public void checkDeptDataScope(Long deptId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()) && StringUtils.isNotNull(deptId))
-        {
-            SysDept dept = new SysDept();
-            dept.setDeptId(deptId);
-            List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
-            if (StringUtils.isEmpty(depts))
-            {
-                throw new ServiceException("没有权限访问部门数据！");
-            }
-        }
-    }
-
-    /**
-     * 新增保存部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    @Override
-    public int insertDept(SysDept dept)
-    {
-        SysDept info = deptMapper.selectDeptById(dept.getParentId());
-        // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
-        {
-            throw new ServiceException("部门停用，不允许新增");
-        }
-        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
-        return deptMapper.insertDept(dept);
-    }
-
-    /**
-     * 修改保存部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    @Override
-    public int updateDept(SysDept dept)
-    {
-        SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
-        SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
-        if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
-        {
-            String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
-            String oldAncestors = oldDept.getAncestors();
-            dept.setAncestors(newAncestors);
-            updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
-        }
-        int result = deptMapper.updateDept(dept);
-        if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
-                && !StringUtils.equals("0", dept.getAncestors()))
-        {
-            // 如果该部门是启用状态，则启用该部门的所有上级部门
-            updateParentDeptStatusNormal(dept);
-        }
-        return result;
-    }
-
-    /**
-     * 修改该部门的父级部门状态
-     * 
-     * @param dept 当前部门
-     */
-    private void updateParentDeptStatusNormal(SysDept dept)
-    {
-        String ancestors = dept.getAncestors();
-        Long[] deptIds = Convert.toLongArray(ancestors);
-        deptMapper.updateDeptStatusNormal(deptIds);
-    }
-
-    /**
-     * 修改子元素关系
-     * 
-     * @param deptId 被修改的部门ID
-     * @param newAncestors 新的父ID集合
-     * @param oldAncestors 旧的父ID集合
-     */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
-    {
-        List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
-        for (SysDept child : children)
-        {
-            child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
-        }
-        if (children.size() > 0)
-        {
-            deptMapper.updateDeptChildren(children);
-        }
-    }
-
-    /**
-     * 删除部门管理信息
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDeptById(Long deptId)
-    {
-        return deptMapper.deleteDeptById(deptId);
-    }
-
-    /**
-     * 递归列表
-     */
-    private void recursionFn(List<SysDept> list, SysDept t)
-    {
-        // 得到子节点列表
-        List<SysDept> childList = getChildList(list, t);
-        t.setChildren(childList);
-        for (SysDept tChild : childList)
-        {
-            if (hasChild(list, tChild))
-            {
-                recursionFn(list, tChild);
-            }
-        }
-    }
-
-    /**
-     * 得到子节点列表
-     */
-    private List<SysDept> getChildList(List<SysDept> list, SysDept t)
-    {
-        List<SysDept> tlist = new ArrayList<SysDept>();
-        Iterator<SysDept> it = list.iterator();
-        while (it.hasNext())
-        {
-            SysDept n = (SysDept) it.next();
-            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
-            {
-                tlist.add(n);
-            }
-        }
-        return tlist;
-    }
-
-    /**
-     * 判断是否有子节点
-     */
-    private boolean hasChild(List<SysDept> list, SysDept t)
-    {
-        return getChildList(list, t).size() > 0;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysDictDataServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysDictDataServiceImpl.java
deleted file mode 100644
index 5928067..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysDictDataServiceImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.common.core.domain.entity.SysDictData;
-import com.djhk.common.utils.DictUtils;
-import com.djhk.system.mapper.SysDictDataMapper;
-import com.djhk.system.service.ISysDictDataService;
-
-/**
- * 字典 业务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysDictDataServiceImpl implements ISysDictDataService
-{
-    @Autowired
-    private SysDictDataMapper dictDataMapper;
-
-    /**
-     * 根据条件分页查询字典数据
-     * 
-     * @param dictData 字典数据信息
-     * @return 字典数据集合信息
-     */
-    @Override
-    public List<SysDictData> selectDictDataList(SysDictData dictData)
-    {
-        return dictDataMapper.selectDictDataList(dictData);
-    }
-
-    /**
-     * 根据字典类型和字典键值查询字典数据信息
-     * 
-     * @param dictType 字典类型
-     * @param dictValue 字典键值
-     * @return 字典标签
-     */
-    @Override
-    public String selectDictLabel(String dictType, String dictValue)
-    {
-        return dictDataMapper.selectDictLabel(dictType, dictValue);
-    }
-
-    /**
-     * 根据字典数据ID查询信息
-     * 
-     * @param dictCode 字典数据ID
-     * @return 字典数据
-     */
-    @Override
-    public SysDictData selectDictDataById(Long dictCode)
-    {
-        return dictDataMapper.selectDictDataById(dictCode);
-    }
-
-    /**
-     * 批量删除字典数据信息
-     * 
-     * @param dictCodes 需要删除的字典数据ID
-     */
-    @Override
-    public void deleteDictDataByIds(Long[] dictCodes)
-    {
-        for (Long dictCode : dictCodes)
-        {
-            SysDictData data = selectDictDataById(dictCode);
-            dictDataMapper.deleteDictDataById(dictCode);
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
-            DictUtils.setDictCache(data.getDictType(), dictDatas);
-        }
-    }
-
-    /**
-     * 新增保存字典数据信息
-     * 
-     * @param data 字典数据信息
-     * @return 结果
-     */
-    @Override
-    public int insertDictData(SysDictData data)
-    {
-        int row = dictDataMapper.insertDictData(data);
-        if (row > 0)
-        {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
-            DictUtils.setDictCache(data.getDictType(), dictDatas);
-        }
-        return row;
-    }
-
-    /**
-     * 修改保存字典数据信息
-     * 
-     * @param data 字典数据信息
-     * @return 结果
-     */
-    @Override
-    public int updateDictData(SysDictData data)
-    {
-        int row = dictDataMapper.updateDictData(data);
-        if (row > 0)
-        {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
-            DictUtils.setDictCache(data.getDictType(), dictDatas);
-        }
-        return row;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysDictTypeServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysDictTypeServiceImpl.java
deleted file mode 100644
index 43a66e4..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysDictTypeServiceImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.djhk.common.constant.UserConstants;
-import com.djhk.common.core.domain.entity.SysDictData;
-import com.djhk.common.core.domain.entity.SysDictType;
-import com.djhk.common.exception.ServiceException;
-import com.djhk.common.utils.DictUtils;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.system.mapper.SysDictDataMapper;
-import com.djhk.system.mapper.SysDictTypeMapper;
-import com.djhk.system.service.ISysDictTypeService;
-
-/**
- * 字典 业务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysDictTypeServiceImpl implements ISysDictTypeService
-{
-    @Autowired
-    private SysDictTypeMapper dictTypeMapper;
-
-    @Autowired
-    private SysDictDataMapper dictDataMapper;
-
-    /**
-     * 项目启动时，初始化字典到缓存
-     */
-    @PostConstruct
-    public void init()
-    {
-        loadingDictCache();
-    }
-
-    /**
-     * 根据条件分页查询字典类型
-     * 
-     * @param dictType 字典类型信息
-     * @return 字典类型集合信息
-     */
-    @Override
-    public List<SysDictType> selectDictTypeList(SysDictType dictType)
-    {
-        return dictTypeMapper.selectDictTypeList(dictType);
-    }
-
-    /**
-     * 根据所有字典类型
-     * 
-     * @return 字典类型集合信息
-     */
-    @Override
-    public List<SysDictType> selectDictTypeAll()
-    {
-        return dictTypeMapper.selectDictTypeAll();
-    }
-
-    /**
-     * 根据字典类型查询字典数据
-     * 
-     * @param dictType 字典类型
-     * @return 字典数据集合信息
-     */
-    @Override
-    public List<SysDictData> selectDictDataByType(String dictType)
-    {
-        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
-            return dictDatas;
-        }
-        dictDatas = dictDataMapper.selectDictDataByType(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
-            DictUtils.setDictCache(dictType, dictDatas);
-            return dictDatas;
-        }
-        return null;
-    }
-
-    /**
-     * 根据字典类型ID查询信息
-     * 
-     * @param dictId 字典类型ID
-     * @return 字典类型
-     */
-    @Override
-    public SysDictType selectDictTypeById(Long dictId)
-    {
-        return dictTypeMapper.selectDictTypeById(dictId);
-    }
-
-    /**
-     * 根据字典类型查询信息
-     * 
-     * @param dictType 字典类型
-     * @return 字典类型
-     */
-    @Override
-    public SysDictType selectDictTypeByType(String dictType)
-    {
-        return dictTypeMapper.selectDictTypeByType(dictType);
-    }
-
-    /**
-     * 批量删除字典类型信息
-     * 
-     * @param dictIds 需要删除的字典ID
-     */
-    @Override
-    public void deleteDictTypeByIds(Long[] dictIds)
-    {
-        for (Long dictId : dictIds)
-        {
-            SysDictType dictType = selectDictTypeById(dictId);
-            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
-            {
-                throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
-            }
-            dictTypeMapper.deleteDictTypeById(dictId);
-            DictUtils.removeDictCache(dictType.getDictType());
-        }
-    }
-
-    /**
-     * 加载字典缓存数据
-     */
-    @Override
-    public void loadingDictCache()
-    {
-        SysDictData dictData = new SysDictData();
-        dictData.setStatus("0");
-        Map<String, List<SysDictData>> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType));
-        for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet())
-        {
-            DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
-        }
-    }
-
-    /**
-     * 清空字典缓存数据
-     */
-    @Override
-    public void clearDictCache()
-    {
-        DictUtils.clearDictCache();
-    }
-
-    /**
-     * 重置字典缓存数据
-     */
-    @Override
-    public void resetDictCache()
-    {
-        clearDictCache();
-        loadingDictCache();
-    }
-
-    /**
-     * 新增保存字典类型信息
-     * 
-     * @param dict 字典类型信息
-     * @return 结果
-     */
-    @Override
-    public int insertDictType(SysDictType dict)
-    {
-        int row = dictTypeMapper.insertDictType(dict);
-        if (row > 0)
-        {
-            DictUtils.setDictCache(dict.getDictType(), null);
-        }
-        return row;
-    }
-
-    /**
-     * 修改保存字典类型信息
-     * 
-     * @param dict 字典类型信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateDictType(SysDictType dict)
-    {
-        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
-        dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
-        int row = dictTypeMapper.updateDictType(dict);
-        if (row > 0)
-        {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
-            DictUtils.setDictCache(dict.getDictType(), dictDatas);
-        }
-        return row;
-    }
-
-    /**
-     * 校验字典类型称是否唯一
-     * 
-     * @param dict 字典类型
-     * @return 结果
-     */
-    @Override
-    public boolean checkDictTypeUnique(SysDictType dict)
-    {
-        Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
-        SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
-        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysLogininforServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysLogininforServiceImpl.java
deleted file mode 100644
index 7cc24a8..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysLogininforServiceImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.system.domain.SysLogininfor;
-import com.djhk.system.mapper.SysLogininforMapper;
-import com.djhk.system.service.ISysLogininforService;
-
-/**
- * 系统访问日志情况信息 服务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysLogininforServiceImpl implements ISysLogininforService
-{
-
-    @Autowired
-    private SysLogininforMapper logininforMapper;
-
-    /**
-     * 新增系统登录日志
-     * 
-     * @param logininfor 访问日志对象
-     */
-    @Override
-    public void insertLogininfor(SysLogininfor logininfor)
-    {
-        logininforMapper.insertLogininfor(logininfor);
-    }
-
-    /**
-     * 查询系统登录日志集合
-     * 
-     * @param logininfor 访问日志对象
-     * @return 登录记录集合
-     */
-    @Override
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor)
-    {
-        return logininforMapper.selectLogininforList(logininfor);
-    }
-
-    /**
-     * 批量删除系统登录日志
-     * 
-     * @param infoIds 需要删除的登录日志ID
-     * @return 结果
-     */
-    @Override
-    public int deleteLogininforByIds(Long[] infoIds)
-    {
-        return logininforMapper.deleteLogininforByIds(infoIds);
-    }
-
-    /**
-     * 清空系统登录日志
-     */
-    @Override
-    public void cleanLogininfor()
-    {
-        logininforMapper.cleanLogininfor();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysMenuServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysMenuServiceImpl.java
deleted file mode 100644
index 4e9c101..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysMenuServiceImpl.java
+++ /dev/null
@@ -1,543 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.common.constant.Constants;
-import com.djhk.common.constant.UserConstants;
-import com.djhk.common.core.domain.TreeSelect;
-import com.djhk.common.core.domain.entity.SysMenu;
-import com.djhk.common.core.domain.entity.SysRole;
-import com.djhk.common.core.domain.entity.SysUser;
-import com.djhk.common.utils.SecurityUtils;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.system.domain.vo.MetaVo;
-import com.djhk.system.domain.vo.RouterVo;
-import com.djhk.system.mapper.SysMenuMapper;
-import com.djhk.system.mapper.SysRoleMapper;
-import com.djhk.system.mapper.SysRoleMenuMapper;
-import com.djhk.system.service.ISysMenuService;
-
-/**
- * 菜单 业务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysMenuServiceImpl implements ISysMenuService
-{
-    public static final String PREMISSION_STRING = "perms[\"{0}\"]";
-
-    @Autowired
-    private SysMenuMapper menuMapper;
-
-    @Autowired
-    private SysRoleMapper roleMapper;
-
-    @Autowired
-    private SysRoleMenuMapper roleMenuMapper;
-
-    /**
-     * 根据用户查询系统菜单列表
-     * 
-     * @param userId 用户ID
-     * @return 菜单列表
-     */
-    @Override
-    public List<SysMenu> selectMenuList(Long userId)
-    {
-        return selectMenuList(new SysMenu(), userId);
-    }
-
-    /**
-     * 查询系统菜单列表
-     * 
-     * @param menu 菜单信息
-     * @return 菜单列表
-     */
-    @Override
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
-    {
-        List<SysMenu> menuList = null;
-        // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId))
-        {
-            menuList = menuMapper.selectMenuList(menu);
-        }
-        else
-        {
-            menu.getParams().put("userId", userId);
-            menuList = menuMapper.selectMenuListByUserId(menu);
-        }
-        return menuList;
-    }
-
-    /**
-     * 根据用户ID查询权限
-     * 
-     * @param userId 用户ID
-     * @return 权限列表
-     */
-    @Override
-    public Set<String> selectMenuPermsByUserId(Long userId)
-    {
-        List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
-        Set<String> permsSet = new HashSet<>();
-        for (String perm : perms)
-        {
-            if (StringUtils.isNotEmpty(perm))
-            {
-                permsSet.addAll(Arrays.asList(perm.trim().split(",")));
-            }
-        }
-        return permsSet;
-    }
-
-    /**
-     * 根据角色ID查询权限
-     * 
-     * @param roleId 角色ID
-     * @return 权限列表
-     */
-    @Override
-    public Set<String> selectMenuPermsByRoleId(Long roleId)
-    {
-        List<String> perms = menuMapper.selectMenuPermsByRoleId(roleId);
-        Set<String> permsSet = new HashSet<>();
-        for (String perm : perms)
-        {
-            if (StringUtils.isNotEmpty(perm))
-            {
-                permsSet.addAll(Arrays.asList(perm.trim().split(",")));
-            }
-        }
-        return permsSet;
-    }
-
-    /**
-     * 根据用户ID查询菜单
-     * 
-     * @param userId 用户名称
-     * @return 菜单列表
-     */
-    @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId)
-    {
-        List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
-        {
-            menus = menuMapper.selectMenuTreeAll();
-        }
-        else
-        {
-            menus = menuMapper.selectMenuTreeByUserId(userId);
-        }
-        return getChildPerms(menus, 0);
-    }
-
-    /**
-     * 根据角色ID查询菜单树信息
-     * 
-     * @param roleId 角色ID
-     * @return 选中菜单列表
-     */
-    @Override
-    public List<Long> selectMenuListByRoleId(Long roleId)
-    {
-        SysRole role = roleMapper.selectRoleById(roleId);
-        return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
-    }
-
-    /**
-     * 构建前端路由所需要的菜单
-     * 
-     * @param menus 菜单列表
-     * @return 路由列表
-     */
-    @Override
-    public List<RouterVo> buildMenus(List<SysMenu> menus)
-    {
-        List<RouterVo> routers = new LinkedList<RouterVo>();
-        for (SysMenu menu : menus)
-        {
-            RouterVo router = new RouterVo();
-            router.setHidden("1".equals(menu.getVisible()));
-            router.setName(getRouteName(menu));
-            router.setPath(getRouterPath(menu));
-            router.setComponent(getComponent(menu));
-            router.setQuery(menu.getQuery());
-            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
-            List<SysMenu> cMenus = menu.getChildren();
-            if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
-            {
-                router.setAlwaysShow(true);
-                router.setRedirect("noRedirect");
-                router.setChildren(buildMenus(cMenus));
-            }
-            else if (isMenuFrame(menu))
-            {
-                router.setMeta(null);
-                List<RouterVo> childrenList = new ArrayList<RouterVo>();
-                RouterVo children = new RouterVo();
-                children.setPath(menu.getPath());
-                children.setComponent(menu.getComponent());
-                children.setName(getRouteName(menu.getRouteName(), menu.getPath()));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
-                children.setQuery(menu.getQuery());
-                childrenList.add(children);
-                router.setChildren(childrenList);
-            }
-            else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
-            {
-                router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
-                router.setPath("/");
-                List<RouterVo> childrenList = new ArrayList<RouterVo>();
-                RouterVo children = new RouterVo();
-                String routerPath = innerLinkReplaceEach(menu.getPath());
-                children.setPath(routerPath);
-                children.setComponent(UserConstants.INNER_LINK);
-                children.setName(getRouteName(menu.getRouteName(), routerPath));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
-                childrenList.add(children);
-                router.setChildren(childrenList);
-            }
-            routers.add(router);
-        }
-        return routers;
-    }
-
-    /**
-     * 构建前端所需要树结构
-     * 
-     * @param menus 菜单列表
-     * @return 树结构列表
-     */
-    @Override
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus)
-    {
-        List<SysMenu> returnList = new ArrayList<SysMenu>();
-        List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
-        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
-        {
-            SysMenu menu = (SysMenu) iterator.next();
-            // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(menu.getParentId()))
-            {
-                recursionFn(menus, menu);
-                returnList.add(menu);
-            }
-        }
-        if (returnList.isEmpty())
-        {
-            returnList = menus;
-        }
-        return returnList;
-    }
-
-    /**
-     * 构建前端所需要下拉树结构
-     * 
-     * @param menus 菜单列表
-     * @return 下拉树结构列表
-     */
-    @Override
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus)
-    {
-        List<SysMenu> menuTrees = buildMenuTree(menus);
-        return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
-    }
-
-    /**
-     * 根据菜单ID查询信息
-     * 
-     * @param menuId 菜单ID
-     * @return 菜单信息
-     */
-    @Override
-    public SysMenu selectMenuById(Long menuId)
-    {
-        return menuMapper.selectMenuById(menuId);
-    }
-
-    /**
-     * 是否存在菜单子节点
-     * 
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    @Override
-    public boolean hasChildByMenuId(Long menuId)
-    {
-        int result = menuMapper.hasChildByMenuId(menuId);
-        return result > 0;
-    }
-
-    /**
-     * 查询菜单使用数量
-     * 
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    @Override
-    public boolean checkMenuExistRole(Long menuId)
-    {
-        int result = roleMenuMapper.checkMenuExistRole(menuId);
-        return result > 0;
-    }
-
-    /**
-     * 新增保存菜单信息
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    @Override
-    public int insertMenu(SysMenu menu)
-    {
-        return menuMapper.insertMenu(menu);
-    }
-
-    /**
-     * 修改保存菜单信息
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    @Override
-    public int updateMenu(SysMenu menu)
-    {
-        return menuMapper.updateMenu(menu);
-    }
-
-    /**
-     * 删除菜单管理信息
-     * 
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    @Override
-    public int deleteMenuById(Long menuId)
-    {
-        return menuMapper.deleteMenuById(menuId);
-    }
-
-    /**
-     * 校验菜单名称是否唯一
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkMenuNameUnique(SysMenu menu)
-    {
-        Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
-        SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
-        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 获取路由名称
-     * 
-     * @param menu 菜单信息
-     * @return 路由名称
-     */
-    public String getRouteName(SysMenu menu)
-    {
-        // 非外链并且是一级目录（类型为目录）
-        if (isMenuFrame(menu))
-        {
-            return StringUtils.EMPTY;
-        }
-        return getRouteName(menu.getRouteName(), menu.getPath());
-    }
-
-    /**
-     * 获取路由名称，如没有配置路由名称则取路由地址
-     * 
-     * @param name 路由名称
-     * @param path 路由地址
-     * @return 路由名称（驼峰格式）
-     */
-    public String getRouteName(String name, String path)
-    {
-        String routerName = StringUtils.isNotEmpty(name) ? name : path;
-        return StringUtils.capitalize(routerName);
-    }
-
-    /**
-     * 获取路由地址
-     * 
-     * @param menu 菜单信息
-     * @return 路由地址
-     */
-    public String getRouterPath(SysMenu menu)
-    {
-        String routerPath = menu.getPath();
-        // 内链打开外网方式
-        if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
-        {
-            routerPath = innerLinkReplaceEach(routerPath);
-        }
-        // 非外链并且是一级目录（类型为目录）
-        if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
-                && UserConstants.NO_FRAME.equals(menu.getIsFrame()))
-        {
-            routerPath = "/" + menu.getPath();
-        }
-        // 非外链并且是一级目录（类型为菜单）
-        else if (isMenuFrame(menu))
-        {
-            routerPath = "/";
-        }
-        return routerPath;
-    }
-
-    /**
-     * 获取组件信息
-     * 
-     * @param menu 菜单信息
-     * @return 组件信息
-     */
-    public String getComponent(SysMenu menu)
-    {
-        String component = UserConstants.LAYOUT;
-        if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
-        {
-            component = menu.getComponent();
-        }
-        else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu))
-        {
-            component = UserConstants.INNER_LINK;
-        }
-        else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
-        {
-            component = UserConstants.PARENT_VIEW;
-        }
-        return component;
-    }
-
-    /**
-     * 是否为菜单内部跳转
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public boolean isMenuFrame(SysMenu menu)
-    {
-        return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
-                && menu.getIsFrame().equals(UserConstants.NO_FRAME);
-    }
-
-    /**
-     * 是否为内链组件
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public boolean isInnerLink(SysMenu menu)
-    {
-        return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath());
-    }
-
-    /**
-     * 是否为parent_view组件
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public boolean isParentView(SysMenu menu)
-    {
-        return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
-    }
-
-    /**
-     * 根据父节点的ID获取所有子节点
-     * 
-     * @param list 分类表
-     * @param parentId 传入的父节点ID
-     * @return String
-     */
-    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId)
-    {
-        List<SysMenu> returnList = new ArrayList<SysMenu>();
-        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();)
-        {
-            SysMenu t = (SysMenu) iterator.next();
-            // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
-            if (t.getParentId() == parentId)
-            {
-                recursionFn(list, t);
-                returnList.add(t);
-            }
-        }
-        return returnList;
-    }
-
-    /**
-     * 递归列表
-     * 
-     * @param list 分类表
-     * @param t 子节点
-     */
-    private void recursionFn(List<SysMenu> list, SysMenu t)
-    {
-        // 得到子节点列表
-        List<SysMenu> childList = getChildList(list, t);
-        t.setChildren(childList);
-        for (SysMenu tChild : childList)
-        {
-            if (hasChild(list, tChild))
-            {
-                recursionFn(list, tChild);
-            }
-        }
-    }
-
-    /**
-     * 得到子节点列表
-     */
-    private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t)
-    {
-        List<SysMenu> tlist = new ArrayList<SysMenu>();
-        Iterator<SysMenu> it = list.iterator();
-        while (it.hasNext())
-        {
-            SysMenu n = (SysMenu) it.next();
-            if (n.getParentId().longValue() == t.getMenuId().longValue())
-            {
-                tlist.add(n);
-            }
-        }
-        return tlist;
-    }
-
-    /**
-     * 判断是否有子节点
-     */
-    private boolean hasChild(List<SysMenu> list, SysMenu t)
-    {
-        return getChildList(list, t).size() > 0;
-    }
-
-    /**
-     * 内链域名特殊字符替换
-     * 
-     * @return 替换后的内链域名
-     */
-    public String innerLinkReplaceEach(String path)
-    {
-        return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":" },
-                new String[] { "", "", "", "/", "/" });
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysNoticeServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysNoticeServiceImpl.java
deleted file mode 100644
index adc2196..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysNoticeServiceImpl.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.system.domain.SysNotice;
-import com.djhk.system.mapper.SysNoticeMapper;
-import com.djhk.system.service.ISysNoticeService;
-
-/**
- * 公告 服务层实现
- * 
- * @author djhk
- */
-@Service
-public class SysNoticeServiceImpl implements ISysNoticeService
-{
-    @Autowired
-    private SysNoticeMapper noticeMapper;
-
-    /**
-     * 查询公告信息
-     * 
-     * @param noticeId 公告ID
-     * @return 公告信息
-     */
-    @Override
-    public SysNotice selectNoticeById(Long noticeId)
-    {
-        return noticeMapper.selectNoticeById(noticeId);
-    }
-
-    /**
-     * 查询公告列表
-     * 
-     * @param notice 公告信息
-     * @return 公告集合
-     */
-    @Override
-    public List<SysNotice> selectNoticeList(SysNotice notice)
-    {
-        return noticeMapper.selectNoticeList(notice);
-    }
-
-    /**
-     * 新增公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    @Override
-    public int insertNotice(SysNotice notice)
-    {
-        return noticeMapper.insertNotice(notice);
-    }
-
-    /**
-     * 修改公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    @Override
-    public int updateNotice(SysNotice notice)
-    {
-        return noticeMapper.updateNotice(notice);
-    }
-
-    /**
-     * 删除公告对象
-     * 
-     * @param noticeId 公告ID
-     * @return 结果
-     */
-    @Override
-    public int deleteNoticeById(Long noticeId)
-    {
-        return noticeMapper.deleteNoticeById(noticeId);
-    }
-
-    /**
-     * 批量删除公告信息
-     * 
-     * @param noticeIds 需要删除的公告ID
-     * @return 结果
-     */
-    @Override
-    public int deleteNoticeByIds(Long[] noticeIds)
-    {
-        return noticeMapper.deleteNoticeByIds(noticeIds);
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysOperLogServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysOperLogServiceImpl.java
deleted file mode 100644
index 450c8eb..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysOperLogServiceImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.system.domain.SysOperLog;
-import com.djhk.system.mapper.SysOperLogMapper;
-import com.djhk.system.service.ISysOperLogService;
-
-/**
- * 操作日志 服务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysOperLogServiceImpl implements ISysOperLogService
-{
-    @Autowired
-    private SysOperLogMapper operLogMapper;
-
-    /**
-     * 新增操作日志
-     * 
-     * @param operLog 操作日志对象
-     */
-    @Override
-    public void insertOperlog(SysOperLog operLog)
-    {
-        operLogMapper.insertOperlog(operLog);
-    }
-
-    /**
-     * 查询系统操作日志集合
-     * 
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
-    {
-        return operLogMapper.selectOperLogList(operLog);
-    }
-
-    /**
-     * 批量删除系统操作日志
-     * 
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    @Override
-    public int deleteOperLogByIds(Long[] operIds)
-    {
-        return operLogMapper.deleteOperLogByIds(operIds);
-    }
-
-    /**
-     * 查询操作日志详细
-     * 
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    @Override
-    public SysOperLog selectOperLogById(Long operId)
-    {
-        return operLogMapper.selectOperLogById(operId);
-    }
-
-    /**
-     * 清空操作日志
-     */
-    @Override
-    public void cleanOperLog()
-    {
-        operLogMapper.cleanOperLog();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysPostServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysPostServiceImpl.java
deleted file mode 100644
index 23fe4c3..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysPostServiceImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.djhk.common.constant.UserConstants;
-import com.djhk.common.exception.ServiceException;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.system.domain.SysPost;
-import com.djhk.system.mapper.SysPostMapper;
-import com.djhk.system.mapper.SysUserPostMapper;
-import com.djhk.system.service.ISysPostService;
-
-/**
- * 岗位信息 服务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysPostServiceImpl implements ISysPostService
-{
-    @Autowired
-    private SysPostMapper postMapper;
-
-    @Autowired
-    private SysUserPostMapper userPostMapper;
-
-    /**
-     * 查询岗位信息集合
-     * 
-     * @param post 岗位信息
-     * @return 岗位信息集合
-     */
-    @Override
-    public List<SysPost> selectPostList(SysPost post)
-    {
-        return postMapper.selectPostList(post);
-    }
-
-    /**
-     * 查询所有岗位
-     * 
-     * @return 岗位列表
-     */
-    @Override
-    public List<SysPost> selectPostAll()
-    {
-        return postMapper.selectPostAll();
-    }
-
-    /**
-     * 通过岗位ID查询岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 角色对象信息
-     */
-    @Override
-    public SysPost selectPostById(Long postId)
-    {
-        return postMapper.selectPostById(postId);
-    }
-
-    /**
-     * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中岗位ID列表
-     */
-    @Override
-    public List<Long> selectPostListByUserId(Long userId)
-    {
-        return postMapper.selectPostListByUserId(userId);
-    }
-
-    /**
-     * 校验岗位名称是否唯一
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkPostNameUnique(SysPost post)
-    {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = postMapper.checkPostNameUnique(post.getPostName());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验岗位编码是否唯一
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkPostCodeUnique(SysPost post)
-    {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 通过岗位ID查询岗位使用数量
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    @Override
-    public int countUserPostById(Long postId)
-    {
-        return userPostMapper.countUserPostById(postId);
-    }
-
-    /**
-     * 删除岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    @Override
-    public int deletePostById(Long postId)
-    {
-        return postMapper.deletePostById(postId);
-    }
-
-    /**
-     * 批量删除岗位信息
-     * 
-     * @param postIds 需要删除的岗位ID
-     * @return 结果
-     */
-    @Override
-    public int deletePostByIds(Long[] postIds)
-    {
-        for (Long postId : postIds)
-        {
-            SysPost post = selectPostById(postId);
-            if (countUserPostById(postId) > 0)
-            {
-                throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName()));
-            }
-        }
-        return postMapper.deletePostByIds(postIds);
-    }
-
-    /**
-     * 新增保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public int insertPost(SysPost post)
-    {
-        return postMapper.insertPost(post);
-    }
-
-    /**
-     * 修改保存岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    @Override
-    public int updatePost(SysPost post)
-    {
-        return postMapper.updatePost(post);
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysRoleServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysRoleServiceImpl.java
deleted file mode 100644
index 793800c..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysRoleServiceImpl.java
+++ /dev/null
@@ -1,427 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.djhk.common.annotation.DataScope;
-import com.djhk.common.constant.UserConstants;
-import com.djhk.common.core.domain.entity.SysRole;
-import com.djhk.common.core.domain.entity.SysUser;
-import com.djhk.common.exception.ServiceException;
-import com.djhk.common.utils.SecurityUtils;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.common.utils.spring.SpringUtils;
-import com.djhk.system.domain.SysRoleDept;
-import com.djhk.system.domain.SysRoleMenu;
-import com.djhk.system.domain.SysUserRole;
-import com.djhk.system.mapper.SysRoleDeptMapper;
-import com.djhk.system.mapper.SysRoleMapper;
-import com.djhk.system.mapper.SysRoleMenuMapper;
-import com.djhk.system.mapper.SysUserRoleMapper;
-import com.djhk.system.service.ISysRoleService;
-
-/**
- * 角色 业务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysRoleServiceImpl implements ISysRoleService
-{
-    @Autowired
-    private SysRoleMapper roleMapper;
-
-    @Autowired
-    private SysRoleMenuMapper roleMenuMapper;
-
-    @Autowired
-    private SysUserRoleMapper userRoleMapper;
-
-    @Autowired
-    private SysRoleDeptMapper roleDeptMapper;
-
-    /**
-     * 根据条件分页查询角色数据
-     * 
-     * @param role 角色信息
-     * @return 角色数据集合信息
-     */
-    @Override
-    @DataScope(deptAlias = "d")
-    public List<SysRole> selectRoleList(SysRole role)
-    {
-        return roleMapper.selectRoleList(role);
-    }
-
-    /**
-     * 根据用户ID查询角色
-     * 
-     * @param userId 用户ID
-     * @return 角色列表
-     */
-    @Override
-    public List<SysRole> selectRolesByUserId(Long userId)
-    {
-        List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
-        List<SysRole> roles = selectRoleAll();
-        for (SysRole role : roles)
-        {
-            for (SysRole userRole : userRoles)
-            {
-                if (role.getRoleId().longValue() == userRole.getRoleId().longValue())
-                {
-                    role.setFlag(true);
-                    break;
-                }
-            }
-        }
-        return roles;
-    }
-
-    /**
-     * 根据用户ID查询权限
-     * 
-     * @param userId 用户ID
-     * @return 权限列表
-     */
-    @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
-    {
-        List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
-        Set<String> permsSet = new HashSet<>();
-        for (SysRole perm : perms)
-        {
-            if (StringUtils.isNotNull(perm))
-            {
-                permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
-            }
-        }
-        return permsSet;
-    }
-
-    /**
-     * 查询所有角色
-     * 
-     * @return 角色列表
-     */
-    @Override
-    public List<SysRole> selectRoleAll()
-    {
-        return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
-    }
-
-    /**
-     * 根据用户ID获取角色选择框列表
-     * 
-     * @param userId 用户ID
-     * @return 选中角色ID列表
-     */
-    @Override
-    public List<Long> selectRoleListByUserId(Long userId)
-    {
-        return roleMapper.selectRoleListByUserId(userId);
-    }
-
-    /**
-     * 通过角色ID查询角色
-     * 
-     * @param roleId 角色ID
-     * @return 角色对象信息
-     */
-    @Override
-    public SysRole selectRoleById(Long roleId)
-    {
-        return roleMapper.selectRoleById(roleId);
-    }
-
-    /**
-     * 校验角色名称是否唯一
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkRoleNameUnique(SysRole role)
-    {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-        SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验角色权限是否唯一
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkRoleKeyUnique(SysRole role)
-    {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-        SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验角色是否允许操作
-     * 
-     * @param role 角色信息
-     */
-    @Override
-    public void checkRoleAllowed(SysRole role)
-    {
-        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
-        {
-            throw new ServiceException("不允许操作超级管理员角色");
-        }
-    }
-
-    /**
-     * 校验角色是否有数据权限
-     * 
-     * @param roleIds 角色id
-     */
-    @Override
-    public void checkRoleDataScope(Long... roleIds)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
-            for (Long roleId : roleIds)
-            {
-                SysRole role = new SysRole();
-                role.setRoleId(roleId);
-                List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
-                if (StringUtils.isEmpty(roles))
-                {
-                    throw new ServiceException("没有权限访问角色数据！");
-                }
-            }
-        }
-    }
-
-    /**
-     * 通过角色ID查询角色使用数量
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    @Override
-    public int countUserRoleByRoleId(Long roleId)
-    {
-        return userRoleMapper.countUserRoleByRoleId(roleId);
-    }
-
-    /**
-     * 新增保存角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int insertRole(SysRole role)
-    {
-        // 新增角色信息
-        roleMapper.insertRole(role);
-        return insertRoleMenu(role);
-    }
-
-    /**
-     * 修改保存角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateRole(SysRole role)
-    {
-        // 修改角色信息
-        roleMapper.updateRole(role);
-        // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
-        return insertRoleMenu(role);
-    }
-
-    /**
-     * 修改角色状态
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    @Override
-    public int updateRoleStatus(SysRole role)
-    {
-        return roleMapper.updateRole(role);
-    }
-
-    /**
-     * 修改数据权限信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int authDataScope(SysRole role)
-    {
-        // 修改角色信息
-        roleMapper.updateRole(role);
-        // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
-        // 新增角色和部门信息（数据权限）
-        return insertRoleDept(role);
-    }
-
-    /**
-     * 新增角色菜单信息
-     * 
-     * @param role 角色对象
-     */
-    public int insertRoleMenu(SysRole role)
-    {
-        int rows = 1;
-        // 新增用户与角色管理
-        List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
-        for (Long menuId : role.getMenuIds())
-        {
-            SysRoleMenu rm = new SysRoleMenu();
-            rm.setRoleId(role.getRoleId());
-            rm.setMenuId(menuId);
-            list.add(rm);
-        }
-        if (list.size() > 0)
-        {
-            rows = roleMenuMapper.batchRoleMenu(list);
-        }
-        return rows;
-    }
-
-    /**
-     * 新增角色部门信息(数据权限)
-     *
-     * @param role 角色对象
-     */
-    public int insertRoleDept(SysRole role)
-    {
-        int rows = 1;
-        // 新增角色与部门（数据权限）管理
-        List<SysRoleDept> list = new ArrayList<SysRoleDept>();
-        for (Long deptId : role.getDeptIds())
-        {
-            SysRoleDept rd = new SysRoleDept();
-            rd.setRoleId(role.getRoleId());
-            rd.setDeptId(deptId);
-            list.add(rd);
-        }
-        if (list.size() > 0)
-        {
-            rows = roleDeptMapper.batchRoleDept(list);
-        }
-        return rows;
-    }
-
-    /**
-     * 通过角色ID删除角色
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int deleteRoleById(Long roleId)
-    {
-        // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(roleId);
-        // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(roleId);
-        return roleMapper.deleteRoleById(roleId);
-    }
-
-    /**
-     * 批量删除角色信息
-     * 
-     * @param roleIds 需要删除的角色ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int deleteRoleByIds(Long[] roleIds)
-    {
-        for (Long roleId : roleIds)
-        {
-            checkRoleAllowed(new SysRole(roleId));
-            checkRoleDataScope(roleId);
-            SysRole role = selectRoleById(roleId);
-            if (countUserRoleByRoleId(roleId) > 0)
-            {
-                throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
-            }
-        }
-        // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenu(roleIds);
-        // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDept(roleIds);
-        return roleMapper.deleteRoleByIds(roleIds);
-    }
-
-    /**
-     * 取消授权用户角色
-     * 
-     * @param userRole 用户和角色关联信息
-     * @return 结果
-     */
-    @Override
-    public int deleteAuthUser(SysUserRole userRole)
-    {
-        return userRoleMapper.deleteUserRoleInfo(userRole);
-    }
-
-    /**
-     * 批量取消授权用户角色
-     * 
-     * @param roleId 角色ID
-     * @param userIds 需要取消授权的用户数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteAuthUsers(Long roleId, Long[] userIds)
-    {
-        return userRoleMapper.deleteUserRoleInfos(roleId, userIds);
-    }
-
-    /**
-     * 批量选择授权用户角色
-     * 
-     * @param roleId 角色ID
-     * @param userIds 需要授权的用户数据ID
-     * @return 结果
-     */
-    @Override
-    public int insertAuthUsers(Long roleId, Long[] userIds)
-    {
-        // 新增用户与角色管理
-        List<SysUserRole> list = new ArrayList<SysUserRole>();
-        for (Long userId : userIds)
-        {
-            SysUserRole ur = new SysUserRole();
-            ur.setUserId(userId);
-            ur.setRoleId(roleId);
-            list.add(ur);
-        }
-        return userRoleMapper.batchUserRole(list);
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysUserOnlineServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysUserOnlineServiceImpl.java
deleted file mode 100644
index 4b0728e..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysUserOnlineServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.djhk.system.service.impl;
-
-import org.springframework.stereotype.Service;
-import com.djhk.common.core.domain.model.LoginUser;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.system.domain.SysUserOnline;
-import com.djhk.system.service.ISysUserOnlineService;
-
-/**
- * 在线用户 服务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysUserOnlineServiceImpl implements ISysUserOnlineService
-{
-    /**
-     * 通过登录地址查询信息
-     * 
-     * @param ipaddr 登录地址
-     * @param user 用户信息
-     * @return 在线用户信息
-     */
-    @Override
-    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
-    {
-        if (StringUtils.equals(ipaddr, user.getIpaddr()))
-        {
-            return loginUserToUserOnline(user);
-        }
-        return null;
-    }
-
-    /**
-     * 通过用户名称查询信息
-     * 
-     * @param userName 用户名称
-     * @param user 用户信息
-     * @return 在线用户信息
-     */
-    @Override
-    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
-    {
-        if (StringUtils.equals(userName, user.getUsername()))
-        {
-            return loginUserToUserOnline(user);
-        }
-        return null;
-    }
-
-    /**
-     * 通过登录地址/用户名称查询信息
-     * 
-     * @param ipaddr 登录地址
-     * @param userName 用户名称
-     * @param user 用户信息
-     * @return 在线用户信息
-     */
-    @Override
-    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
-    {
-        if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-        {
-            return loginUserToUserOnline(user);
-        }
-        return null;
-    }
-
-    /**
-     * 设置在线用户信息
-     * 
-     * @param user 用户信息
-     * @return 在线用户
-     */
-    @Override
-    public SysUserOnline loginUserToUserOnline(LoginUser user)
-    {
-        if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser()))
-        {
-            return null;
-        }
-        SysUserOnline sysUserOnline = new SysUserOnline();
-        sysUserOnline.setTokenId(user.getToken());
-        sysUserOnline.setUserName(user.getUsername());
-        sysUserOnline.setIpaddr(user.getIpaddr());
-        sysUserOnline.setLoginLocation(user.getLoginLocation());
-        sysUserOnline.setBrowser(user.getBrowser());
-        sysUserOnline.setOs(user.getOs());
-        sysUserOnline.setLoginTime(user.getLoginTime());
-        if (StringUtils.isNotNull(user.getUser().getDept()))
-        {
-            sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
-        }
-        return sysUserOnline;
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/system/service/impl/SysUserServiceImpl.java b/djhk-system/src/main/java/com/djhk/system/service/impl/SysUserServiceImpl.java
deleted file mode 100644
index 499b5eb..0000000
--- a/djhk-system/src/main/java/com/djhk/system/service/impl/SysUserServiceImpl.java
+++ /dev/null
@@ -1,565 +0,0 @@
-package com.djhk.system.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.Validator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import com.djhk.common.annotation.DataScope;
-import com.djhk.common.constant.UserConstants;
-import com.djhk.common.core.domain.entity.SysRole;
-import com.djhk.common.core.domain.entity.SysUser;
-import com.djhk.common.exception.ServiceException;
-import com.djhk.common.utils.SecurityUtils;
-import com.djhk.common.utils.StringUtils;
-import com.djhk.common.utils.bean.BeanValidators;
-import com.djhk.common.utils.spring.SpringUtils;
-import com.djhk.system.domain.SysPost;
-import com.djhk.system.domain.SysUserPost;
-import com.djhk.system.domain.SysUserRole;
-import com.djhk.system.mapper.SysPostMapper;
-import com.djhk.system.mapper.SysRoleMapper;
-import com.djhk.system.mapper.SysUserMapper;
-import com.djhk.system.mapper.SysUserPostMapper;
-import com.djhk.system.mapper.SysUserRoleMapper;
-import com.djhk.system.service.ISysConfigService;
-import com.djhk.system.service.ISysDeptService;
-import com.djhk.system.service.ISysUserService;
-
-/**
- * 用户 业务层处理
- * 
- * @author djhk
- */
-@Service
-public class SysUserServiceImpl implements ISysUserService
-{
-    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-
-    @Autowired
-    private SysUserMapper userMapper;
-
-    @Autowired
-    private SysRoleMapper roleMapper;
-
-    @Autowired
-    private SysPostMapper postMapper;
-
-    @Autowired
-    private SysUserRoleMapper userRoleMapper;
-
-    @Autowired
-    private SysUserPostMapper userPostMapper;
-
-    @Autowired
-    private ISysConfigService configService;
-
-    @Autowired
-    private ISysDeptService deptService;
-
-    @Autowired
-    protected Validator validator;
-
-    /**
-     * 根据条件分页查询用户列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUserList(SysUser user)
-    {
-        return userMapper.selectUserList(user);
-    }
-
-    /**
-     * 根据条件分页查询已分配用户角色列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectAllocatedList(SysUser user)
-    {
-        return userMapper.selectAllocatedList(user);
-    }
-
-    /**
-     * 根据条件分页查询未分配用户角色列表
-     * 
-     * @param user 用户信息
-     * @return 用户信息集合信息
-     */
-    @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUnallocatedList(SysUser user)
-    {
-        return userMapper.selectUnallocatedList(user);
-    }
-
-    /**
-     * 通过用户名查询用户
-     * 
-     * @param userName 用户名
-     * @return 用户对象信息
-     */
-    @Override
-    public SysUser selectUserByUserName(String userName)
-    {
-        return userMapper.selectUserByUserName(userName);
-    }
-
-    /**
-     * 通过用户ID查询用户
-     * 
-     * @param userId 用户ID
-     * @return 用户对象信息
-     */
-    @Override
-    public SysUser selectUserById(Long userId)
-    {
-        return userMapper.selectUserById(userId);
-    }
-
-    /**
-     * 查询用户所属角色组
-     * 
-     * @param userName 用户名
-     * @return 结果
-     */
-    @Override
-    public String selectUserRoleGroup(String userName)
-    {
-        List<SysRole> list = roleMapper.selectRolesByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
-            return StringUtils.EMPTY;
-        }
-        return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
-    }
-
-    /**
-     * 查询用户所属岗位组
-     * 
-     * @param userName 用户名
-     * @return 结果
-     */
-    @Override
-    public String selectUserPostGroup(String userName)
-    {
-        List<SysPost> list = postMapper.selectPostsByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
-            return StringUtils.EMPTY;
-        }
-        return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
-    }
-
-    /**
-     * 校验用户名称是否唯一
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkUserNameUnique(SysUser user)
-    {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验手机号码是否唯一
-     *
-     * @param user 用户信息
-     * @return
-     */
-    @Override
-    public boolean checkPhoneUnique(SysUser user)
-    {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验email是否唯一
-     *
-     * @param user 用户信息
-     * @return
-     */
-    @Override
-    public boolean checkEmailUnique(SysUser user)
-    {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
-            return UserConstants.NOT_UNIQUE;
-        }
-        return UserConstants.UNIQUE;
-    }
-
-    /**
-     * 校验用户是否允许操作
-     * 
-     * @param user 用户信息
-     */
-    @Override
-    public void checkUserAllowed(SysUser user)
-    {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
-        {
-            throw new ServiceException("不允许操作超级管理员用户");
-        }
-    }
-
-    /**
-     * 校验用户是否有数据权限
-     * 
-     * @param userId 用户id
-     */
-    @Override
-    public void checkUserDataScope(Long userId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
-            SysUser user = new SysUser();
-            user.setUserId(userId);
-            List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
-            if (StringUtils.isEmpty(users))
-            {
-                throw new ServiceException("没有权限访问用户数据！");
-            }
-        }
-    }
-
-    /**
-     * 新增保存用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int insertUser(SysUser user)
-    {
-        // 新增用户信息
-        int rows = userMapper.insertUser(user);
-        // 新增用户岗位关联
-        insertUserPost(user);
-        // 新增用户与角色管理
-        insertUserRole(user);
-        return rows;
-    }
-
-    /**
-     * 注册用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    @Override
-    public boolean registerUser(SysUser user)
-    {
-        return userMapper.insertUser(user) > 0;
-    }
-
-    /**
-     * 修改保存用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateUser(SysUser user)
-    {
-        Long userId = user.getUserId();
-        // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        // 新增用户与角色管理
-        insertUserRole(user);
-        // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
-        // 新增用户与岗位管理
-        insertUserPost(user);
-        return userMapper.updateUser(user);
-    }
-
-    /**
-     * 用户授权角色
-     * 
-     * @param userId 用户ID
-     * @param roleIds 角色组
-     */
-    @Override
-    @Transactional
-    public void insertUserAuth(Long userId, Long[] roleIds)
-    {
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        insertUserRole(userId, roleIds);
-    }
-
-    /**
-     * 修改用户状态
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    @Override
-    public int updateUserStatus(SysUser user)
-    {
-        return userMapper.updateUserStatus(user.getUserId(), user.getStatus());
-    }
-
-    /**
-     * 修改用户基本信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    @Override
-    public int updateUserProfile(SysUser user)
-    {
-        return userMapper.updateUser(user);
-    }
-
-    /**
-     * 修改用户头像
-     * 
-     * @param userId 用户ID
-     * @param avatar 头像地址
-     * @return 结果
-     */
-    @Override
-    public boolean updateUserAvatar(Long userId, String avatar)
-    {
-        return userMapper.updateUserAvatar(userId, avatar) > 0;
-    }
-
-    /**
-     * 更新用户登录信息（IP和登录时间）
-     * 
-     * @param userId 用户ID
-     * @param loginIp 登录IP地址
-     * @param loginDate 登录时间
-     * @return 结果
-     */
-    public void updateLoginInfo(Long userId, String loginIp, Date loginDate)
-    {
-        userMapper.updateLoginInfo(userId, loginIp, loginDate);
-    }
-
-    /**
-     * 重置用户密码
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    @Override
-    public int resetPwd(SysUser user)
-    {
-        return userMapper.resetUserPwd(user.getUserId(), user.getPassword());
-    }
-
-    /**
-     * 重置用户密码
-     * 
-     * @param userId 用户ID
-     * @param password 密码
-     * @return 结果
-     */
-    @Override
-    public int resetUserPwd(Long userId, String password)
-    {
-        return userMapper.resetUserPwd(userId, password);
-    }
-
-    /**
-     * 新增用户角色信息
-     * 
-     * @param user 用户对象
-     */
-    public void insertUserRole(SysUser user)
-    {
-        this.insertUserRole(user.getUserId(), user.getRoleIds());
-    }
-
-    /**
-     * 新增用户岗位信息
-     * 
-     * @param user 用户对象
-     */
-    public void insertUserPost(SysUser user)
-    {
-        Long[] posts = user.getPostIds();
-        if (StringUtils.isNotEmpty(posts))
-        {
-            // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
-            for (Long postId : posts)
-            {
-                SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
-                up.setPostId(postId);
-                list.add(up);
-            }
-            userPostMapper.batchUserPost(list);
-        }
-    }
-
-    /**
-     * 新增用户角色信息
-     * 
-     * @param userId 用户ID
-     * @param roleIds 角色组
-     */
-    public void insertUserRole(Long userId, Long[] roleIds)
-    {
-        if (StringUtils.isNotEmpty(roleIds))
-        {
-            // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
-            for (Long roleId : roleIds)
-            {
-                SysUserRole ur = new SysUserRole();
-                ur.setUserId(userId);
-                ur.setRoleId(roleId);
-                list.add(ur);
-            }
-            userRoleMapper.batchUserRole(list);
-        }
-    }
-
-    /**
-     * 通过用户ID删除用户
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int deleteUserById(Long userId)
-    {
-        // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
-        // 删除用户与岗位表
-        userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
-    }
-
-    /**
-     * 批量删除用户信息
-     * 
-     * @param userIds 需要删除的用户ID
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int deleteUserByIds(Long[] userIds)
-    {
-        for (Long userId : userIds)
-        {
-            checkUserAllowed(new SysUser(userId));
-            checkUserDataScope(userId);
-        }
-        // 删除用户与角色关联
-        userRoleMapper.deleteUserRole(userIds);
-        // 删除用户与岗位关联
-        userPostMapper.deleteUserPost(userIds);
-        return userMapper.deleteUserByIds(userIds);
-    }
-
-    /**
-     * 导入用户数据
-     * 
-     * @param userList 用户数据列表
-     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName 操作用户
-     * @return 结果
-     */
-    @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
-    {
-        if (StringUtils.isNull(userList) || userList.size() == 0)
-        {
-            throw new ServiceException("导入用户数据不能为空！");
-        }
-        int successNum = 0;
-        int failureNum = 0;
-        StringBuilder successMsg = new StringBuilder();
-        StringBuilder failureMsg = new StringBuilder();
-        for (SysUser user : userList)
-        {
-            try
-            {
-                // 验证是否存在这个用户
-                SysUser u = userMapper.selectUserByUserName(user.getUserName());
-                if (StringUtils.isNull(u))
-                {
-                    BeanValidators.validateWithException(validator, user);
-                    deptService.checkDeptDataScope(user.getDeptId());
-                    String password = configService.selectConfigByKey("sys.user.initPassword");
-                    user.setPassword(SecurityUtils.encryptPassword(password));
-                    user.setCreateBy(operName);
-                    userMapper.insertUser(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                }
-                else if (isUpdateSupport)
-                {
-                    BeanValidators.validateWithException(validator, user);
-                    checkUserAllowed(u);
-                    checkUserDataScope(u.getUserId());
-                    deptService.checkDeptDataScope(user.getDeptId());
-                    user.setUserId(u.getUserId());
-                    user.setDeptId(u.getDeptId());
-                    user.setUpdateBy(operName);
-                    userMapper.updateUser(user);
-                    successNum++;
-                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
-                }
-                else
-                {
-                    failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
-                }
-            }
-            catch (Exception e)
-            {
-                failureNum++;
-                String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
-                failureMsg.append(msg + e.getMessage());
-                log.error(msg, e);
-            }
-        }
-        if (failureNum > 0)
-        {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-            throw new ServiceException(failureMsg.toString());
-        }
-        else
-        {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
-        }
-        return successMsg.toString();
-    }
-}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirplaneController.java b/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirplaneController.java
new file mode 100644
index 0000000..101f05c
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirplaneController.java
@@ -0,0 +1,136 @@
+package com.djhk.uav.airspace.controller;
+
+
+
+import com.djhk.common.core.controller.BaseController;
+import com.djhk.common.core.domain.AjaxResult;
+import com.djhk.common.core.domain.model.LoginUser;
+import com.djhk.common.core.page.TableDataInfo;
+import com.djhk.common.utils.DateUtils;
+import com.djhk.common.utils.SecurityUtils;
+import com.djhk.uav.airspace.domain.AirplaneApply;
+import com.djhk.uav.airspace.service.AirplaneService;
+import com.djhk.uav.airspace.service.AirspaceWaypointService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+
+import static com.djhk.common.utils.PageUtils.startPage;
+
+@RestController
+@RequestMapping("/airplane")
+@Slf4j
+public class AirplaneController extends BaseController {
+    @Resource
+    private AirplaneService airplaneService;
+//    @Resource
+//    private RemoteUserService userService;
+    @Resource
+    private AirspaceWaypointService airplaneWaypointService;
+
+    /**
+     * 查询飞行申请
+     */
+    @GetMapping("/list")
+    public TableDataInfo getList(AirplaneApply airplaneApply)
+    {
+//        SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (airplaneApply.getDeptId() == null) {
+            airplaneApply.setDeptId(loginUser.getDeptId());
+        }
+        startPage();
+        List<AirplaneApply> list = airplaneService.selectAirplaneApplyList(airplaneApply);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询详情
+     */
+    @GetMapping(value = "/{airplaneApplyId}")
+    public AjaxResult selectAirplaneApplyById(@PathVariable Long airplaneApplyId){
+        AirplaneApply airplaneApply = airplaneService.selectAirplaneApplyById(airplaneApplyId);
+        return AjaxResult.success(airplaneApply);
+    }
+
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, AirplaneApply airplaneApply)
+//    {
+////        SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+////        Long deptId = sysUser.getDeptId();
+////        airplaneApply.setDept(deptId);
+////        List<UavOperator> list = uavOperatorService.selectUavOperatorList(uavOperator);
+////        ExcelUtil<UavOperator> util = new ExcelUtil<UavOperator>(UavOperator.class);
+////        util.exportExcel(response, list, "申请空域数据");
+//
+//        List<AirplaneApplyExport> list = airplaneService.exportAirplaneApplyList(airplaneApply);
+//        ExcelUtil<AirplaneApplyExport> util = new ExcelUtil<AirplaneApplyExport>(AirplaneApplyExport.class);
+//        util.exportExcel(response, list, "申请空域数据");
+//    }
+
+
+    /**
+     * 导出
+     * @param response
+     * @param
+     */
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Long id) throws Exception {
+//        List<AirplaneApplyExport> list = airplaneService.exportAirplaneApplyList(airplaneApply);
+//        ExcelUtil<AirplaneApplyExport> util = new ExcelUtil<AirplaneApplyExport>(AirplaneApplyExport.class);
+//        util.exportExcel(response, list, "申请空域数据")
+
+        airplaneService.exportAirplaneApply(response,id);
+    }
+
+
+    /**
+     * 新增
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody AirplaneApply airplaneApply){
+        logger.info("airplaneApply数据为："+airplaneApply.toString());
+        Date nowDate = DateUtils.getNowDate();
+        airplaneApply.setCreateTime(nowDate);
+        LoginUser securityUser = SecurityUtils.getLoginUser();
+        airplaneApply.setCreateBy(SecurityUtils.getUsername());
+        airplaneApply.setDeptId(securityUser.getDeptId());
+        if (airplaneApply.getSts().isEmpty()){
+            airplaneApply.setSts("0");
+        }
+        airplaneService.insertAirplaneApply(airplaneApply);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping
+    public  AjaxResult edit(@RequestBody AirplaneApply airplaneApply){
+        Date nowDate = DateUtils.getNowDate();
+        airplaneApply.setUpdateTime(nowDate);
+        airplaneApply.setUpdateBy(SecurityUtils.getUsername());
+        LoginUser securityUser = SecurityUtils.getLoginUser();
+        if ( (SecurityUtils.getUsername() == airplaneApply.getCreateBy())&& (airplaneApply.getSts().equals("5") || airplaneApply.getSts().equals("4") )){
+            return AjaxResult.success(airplaneService.updateAirplaneApply(airplaneApply));
+        }else if (securityUser.getDeptId() == 1L){
+            return AjaxResult.success(airplaneService.updateAirplaneApply(airplaneApply));
+        }else {
+            return AjaxResult.error("该状态下禁止修改！");
+        }
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping(value = "/{airplaneApplyIds}")
+    public  AjaxResult delete(@PathVariable Long[] airplaneApplyIds){
+        return AjaxResult.success(airplaneService.deleteAirplaneApplyByIds(airplaneApplyIds));
+    }
+    
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirspaceController.java b/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirspaceController.java
new file mode 100644
index 0000000..b1eecc3
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/controller/AirspaceController.java
@@ -0,0 +1,134 @@
+package com.djhk.uav.airspace.controller;
+
+
+
+import com.djhk.common.core.controller.BaseController;
+import com.djhk.common.core.domain.AjaxResult;
+import com.djhk.common.core.domain.model.LoginUser;;
+import com.djhk.common.core.page.TableDataInfo;
+import com.djhk.common.utils.DateUtils;
+import com.djhk.common.utils.SecurityUtils;
+import com.djhk.uav.airspace.domain.AirspaceApply;
+import com.djhk.uav.airspace.service.AirspaceService;
+import com.djhk.uav.airspace.service.AirspaceWaypointService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@RequestMapping("/airspace")
+public class AirspaceController extends BaseController {
+    @Resource
+    private AirspaceService airspaceService;
+//    @Resource
+//    private RemoteUserService userService;
+    @Resource
+    private AirspaceWaypointService airspaceWaypointService;
+
+    /**
+     * 查询空域申请
+     */
+    @GetMapping("/list")
+    public TableDataInfo getList(AirspaceApply airspaceApply)
+    {
+        startPage();
+//        SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+        LoginUser securityUser = SecurityUtils.getLoginUser();
+        airspaceApply.setCreateBy(SecurityUtils.getUsername());
+        airspaceApply.setDeptId(securityUser.getDeptId());
+        List<AirspaceApply> list = airspaceService.selectAirspaceApplyList(airspaceApply);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询详情
+     */
+    @GetMapping(value = "/{airspaceApplyId}")
+    public AjaxResult selectAirspaceApplyById(@PathVariable Long airspaceApplyId){
+        AirspaceApply airspaceApply = airspaceService.selectAirspaceApplyById(airspaceApplyId);
+//        List<AirspaceWaypoint> airspaceWaypoints = airspaceWaypointService.selectAirspaceWaypointList(airspaceApplyId);
+//        airspaceApply.setAirlineWaypointList(airspaceWaypoints);
+        return AjaxResult.success(airspaceApply);
+    }
+
+
+    /**
+     * 新增
+     */
+//    @PostMapping
+//    public AjaxResult add(@RequestBody AirspaceApply airspaceApply){
+//        logger.info("airspaceApply数据为："+airspaceApply.toString());
+//        SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//        Date nowDate = DateUtils.getNowDate();
+//        airspaceApply.setCreateTime(nowDate);
+//        airspaceApply.setCreateBy(sysUser.getUserName());
+////        airspaceApply.setSysDeptNo(sysUser.getDeptId());
+//        airspaceService.insertAirspaceApply(airspaceApply);
+//        Long airspaceApplyId = airspaceService.selectAirspaceApplyId();
+//        if (airspaceApply.getAirlineWaypointList() !=null && airspaceApply.getAirlineWaypointList().size()>0){
+//            for (AirspaceWaypoint airspaceWaypoint : airspaceApply.getAirlineWaypointList()) {
+//                airspaceWaypoint.setAirspaceApplyId(airspaceApplyId);
+//                airspaceWaypointService.insertAirspaceWaypoint(airspaceWaypoint);
+//            }
+//        }
+//        return AjaxResult.success();
+//    }
+    @PostMapping
+    public AjaxResult add(@RequestBody AirspaceApply airspaceApply){
+        logger.info("airspaceApply数据为："+airspaceApply.toString());
+        Date nowDate = DateUtils.getNowDate();
+        airspaceApply.setCreateTime(nowDate);
+        LoginUser securityUser = SecurityUtils.getLoginUser();
+        airspaceApply.setCreateBy(SecurityUtils.getUsername());
+        airspaceApply.setDeptId(securityUser.getDeptId());
+//        airspaceApply.setSysDeptNo(sysUser.getDeptId());
+//        airspaceService.insertAirspaceApply(airspaceApply);
+//        Long airspaceApplyId = airspaceService.selectAirspaceApplyId();
+//        if (airspaceApply.getAirlineWaypointList() !=null && airspaceApply.getAirlineWaypointList().size()>0){
+//            for (AirspaceWaypoint airspaceWaypoint : airspaceApply.getAirlineWaypointList()) {
+//                airspaceWaypoint.setAirspaceApplyId(airspaceApplyId);
+//                airspaceWaypointService.insertAirspaceWaypoint(airspaceWaypoint);
+//            }
+//        }
+        return AjaxResult.success(airspaceService.insertAirspaceApply(airspaceApply));
+    }
+
+    /**
+     * 修改
+     */
+//    @PutMapping
+//    public  AjaxResult edit(@RequestBody AirspaceApply airspaceApply){
+//        SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//        Date nowDate = DateUtils.getNowDate();
+//        airspaceApply.setUpdateTime(nowDate);
+//        airspaceApply.setUpdateBy(sysUser.getUserName());
+//        airspaceWaypointService.deleteAirspaceWaypointById(airspaceApply.getId());
+//        if (airspaceApply.getAirlineWaypointList().size()>0){
+//            for (AirspaceWaypoint airspaceWaypoint : airspaceApply.getAirlineWaypointList()) {
+//                airspaceWaypoint.setAirspaceApplyId(airspaceApply.getId());
+//                airspaceWaypointService.insertAirspaceWaypoint(airspaceWaypoint);
+//            }
+//        }
+//        return AjaxResult.success(airspaceService.updateAirspaceApply(airspaceApply));
+//    }
+
+    @PutMapping
+    public  AjaxResult edit(@RequestBody AirspaceApply airspaceApply){
+        Date nowDate = DateUtils.getNowDate();
+        airspaceApply.setUpdateTime(nowDate);
+        airspaceApply.setUpdateBy(SecurityUtils.getUsername());
+        return AjaxResult.success(airspaceService.updateAirspaceApply(airspaceApply));
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping(value = "/{airspaceApplyIds}")
+    public  AjaxResult delete(@PathVariable Long[] airspaceApplyIds){
+        return AjaxResult.success(airspaceService.deleteAirspaceApplyByIds(airspaceApplyIds));
+    }
+    
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApply.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApply.java
new file mode 100644
index 0000000..f41acce
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApply.java
@@ -0,0 +1,131 @@
+package com.djhk.uav.airspace.domain;
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.annotation.Excels;
+import com.djhk.common.core.domain.BaseEntity;
+import com.djhk.common.core.domain.entity.SysDept;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class AirplaneApply extends BaseEntity {
+
+    /**
+     * 主键序号
+     */
+    private Long id;
+
+    /**
+     * 飞行申报名称
+     */
+    @Excel(name = "飞行申报名称")
+    private String name;
+
+    /**
+     * 申请状态码
+     */
+    @Excel(name = "申请状态", readConverterExp = "0=发起申请,1=审批中 2=批准 3=不予批准")
+    private String sts;
+
+
+    /**
+     * 申请人联系方式
+     */
+    @Excel(name = "申请人联系方式")
+    private String tel;
+
+    /**
+     * 类型
+     */
+    private String type;
+    /**
+     * 组织id
+     */
+    private Long deptId;
+
+    /**
+     * 任务性质 0 飞行任务 1 飞行训练
+     */
+    private String taskProp;
+
+
+    /** 计划飞行时间 */
+//    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "计划飞行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date flyTime;
+
+    /**
+     * 飞手列表
+     */
+    @Excel(name = "飞手列表")
+    private List<UavOperator> uavOperators;
+
+    /**
+     * 无人机列表
+     */
+    @Excel(name = "无人机列表")
+    private List<UavInfo> uavInfos;
+
+    /**
+     * 空域列表
+     */
+    @Excel(name = "空域列表")
+    private List<AirspaceApply> airspaceApplies;
+
+    /** 部门对象 */
+    @Excels({
+            @Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
+            @Excel(name = "部门负责人", targetAttr = "leader", type = Excel.Type.EXPORT)
+    })
+    private SysDept dept;
+
+    /**
+     * 申请空域名称
+     */
+    @Excel(name = "申请空域名称")
+    private List<String> airspaceName;
+
+    /**
+     * 申请无人机名称
+     */
+    @Excel(name = "申请无人机名称")
+    private List<String> uavInfoName;
+
+    /**
+     * 申请飞手
+     */
+    @Excel(name = "申请无人机名称")
+    private List<String> uavOperatorName;
+
+
+    /**
+     * equCode
+     */
+    private List<String> airUAV;
+
+
+    /**
+     * 类型
+     */
+    private Boolean isShowStatus;
+
+
+    /**
+     * 申请附件
+     */
+    private String proUrl;
+
+    /**
+     * 批复附件
+     */
+    private String finalUrl;
+
+    /**
+     * 是否能修改
+     */
+    private String handle;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyAirplane.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyAirplane.java
new file mode 100644
index 0000000..febc723
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyAirplane.java
@@ -0,0 +1,28 @@
+package com.djhk.uav.airspace.domain;
+
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class AirplaneApplyAirplane extends BaseEntity {
+
+    /**
+     * 主键序号
+     */
+    private Long id;
+
+    /**
+     * 飞行器ID
+     */
+    private Long airplaneId;
+
+    /**
+     * 申请飞行计划
+     */
+    private Long airplaneApplyId;
+
+    /**
+     * 申请飞行计划
+     */
+    private String modelId;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyAirspace.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyAirspace.java
new file mode 100644
index 0000000..f475693
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyAirspace.java
@@ -0,0 +1,23 @@
+package com.djhk.uav.airspace.domain;
+
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class AirplaneApplyAirspace extends BaseEntity {
+
+    /**
+     * 主键序号
+     */
+    private Long id;
+
+    /**
+     * 飞申请空域ID
+     */
+    private Long airspaceId;
+
+    /**
+     * 申请飞行计划ID
+     */
+    private Long airplaneApplyId;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyExport.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyExport.java
new file mode 100644
index 0000000..c81f1e3
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyExport.java
@@ -0,0 +1,108 @@
+package com.djhk.uav.airspace.domain;
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class AirplaneApplyExport extends BaseEntity {
+
+    /**
+     * 主键序号
+     */
+    private Long id;
+
+    /**
+     * 飞行申报名称
+     */
+    @Excel(name = "飞行申报名称")
+    private String name;
+
+    /**
+     * 申请状态
+     */
+    @Excel(name = "申请状态", readConverterExp = "0=发起申请,1=审批中 2=批准 3=不予批准")
+    private String sts;
+
+
+    /**
+     * 任务性质 0 飞行任务 1 飞行训练
+     */
+    @Excel(name = "任务性质", readConverterExp = "0=飞行任务,1=飞行训练")
+    private String taskProp;
+
+    /**
+     * 申报空域名称
+     */
+    @Excel(name = "申报空域名称")
+    private String airspaceNames;
+
+    /**
+     * 申报空域经纬度
+     */
+    @Excel(name = "申报空域经纬度")
+    private String location;
+
+    /**
+     * 申报空域高度
+     */
+    @Excel(name = "申报空域最低高度")
+    private String heightMin;
+
+    /**
+     * 申报空域高度
+     */
+    @Excel(name = "申报空域最高高度")
+    private String heightMax;
+    /**
+     * 申报空域半径
+     */
+//    @Excel(name = "申报空域经纬度")
+//    private String radition;
+
+    /**
+     * 开始时间
+     */
+    @Excel(name = "开始时间")
+    private String planBeg;
+
+    /**
+     * 结束时间
+     */
+    @Excel(name = "结束时间")
+    private String planEnd;
+
+    /**
+     * 申请无人机名称
+     */
+    @Excel(name = "申请无人机名称")
+    private String uavInfoNames;
+
+
+    /**
+     * 申请无人机警航编号
+     */
+//    @Excel(name = "申请无人机名称")
+    private String uavInfoNameCode;
+
+
+    /**
+     * 申请无人机唯一识别码
+     */
+//    @Excel(name = "申请无人机名称")
+    private String uavInfoNameQuSn;
+
+    /**
+     * 飞手名字
+     */
+    @Excel(name = "申请飞手")
+    private String uavOperatorNames;
+
+    /**
+     * 部门名称
+     */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyOperator.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyOperator.java
new file mode 100644
index 0000000..b61dcba
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirplaneApplyOperator.java
@@ -0,0 +1,24 @@
+package com.djhk.uav.airspace.domain;
+
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class AirplaneApplyOperator extends BaseEntity {
+
+    /**
+     * 主键序号
+     */
+    private Long id;
+
+
+    /**
+     * 飞手ID
+     */
+    private Long operatorId;
+
+    /**
+     * 申请飞行计划ID
+     */
+    private Long airplaneApplyId;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirspaceApply.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirspaceApply.java
new file mode 100644
index 0000000..8d63973
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirspaceApply.java
@@ -0,0 +1,236 @@
+package com.djhk.uav.airspace.domain;
+
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AirspaceApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键序号
+     */
+    private Long id;
+
+    /**
+     * 申请时间
+     */
+    private String applyTime;
+
+    /**
+     * 用户类型
+     */
+    private String userType;
+
+    /**
+     * 申请人
+     */
+    private String userName;
+
+    /**
+     * 单位类型
+     */
+    private String deptType;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String deptCode;
+
+    /**
+     * 联系人姓名
+     */
+    private String deptPname;
+
+    /**
+     * 联系人手机号码
+     */
+    private String phone;
+
+    /**
+     * 电子邮箱
+     */
+    private String email;
+
+    /**
+     * 飞行活动申请类型
+     */
+    private String planType;
+
+    /**
+     * 预计飞行最大高度
+     */
+    private String maxHegiht;
+
+    /**
+     * 开始时间
+     */
+    private String planBeg;
+
+    /**
+     * 结束时间
+     */
+    private String planEnd;
+
+    /**
+     * 通信联络方法
+     */
+    private String txll;
+
+    /**
+     * 任务性质
+     */
+    private String taskType;
+
+    /**
+     * 操控模式
+     */
+    private String optType;
+
+    /**
+     * 飞行模式
+     */
+    private String flyType;
+
+    /**
+     * 起降备降场地
+     */
+    private String remarkQjbj;
+
+    /**
+     * 应急处置程序
+     */
+    private String remarkYjcz;
+
+    /**
+     * 特殊飞行保障需求
+     */
+    private String remarkTsxq;
+
+    /**
+     * 通导和被监视能力
+     */
+    private String remarkTdjn;
+
+    /**
+     * 飞行速度和进出空域方法
+     */
+    private String remarkFxhx;
+
+    /**
+     * 指挥控制链路无线电频率以及占用带宽
+     */
+    private String remarkZhkz;
+
+    /**
+     * 二次雷达应答机或者有关自动监视设备代码
+     */
+    private String remarkEcld;
+
+    /**
+     * 其他
+     */
+    private String remarkQtxx;
+
+    /**
+     * 涉及的特殊飞行活动
+     */
+    private String six;
+
+    /**
+     * 空域列表
+     */
+    private String spaces;
+
+    /**
+     * 任务审批文件
+     */
+    private String files;
+
+    /**
+     * 预审状态
+     */
+    private String applySts;
+
+    /**
+     * 预审意见
+     */
+    private String applyDsc;
+
+    /**
+     * 最大飞行高度
+     */
+    private String hightMax;
+
+    /**
+     * 最小飞行高度
+     */
+    private String hightMin;
+
+    /**
+     * 维度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 所属战区
+     */
+    private String militaryAreaName;
+
+    /**
+     * 所属战区ID
+     */
+    private String militaryAreaId;
+
+    /**
+     * 空域名称
+     */
+    private String name;
+
+    /**
+     * 飞行规则
+     */
+    private String flightRule;
+
+    /**
+     * 空域类型
+     */
+    private String airspaceType;
+
+    /**
+     * 空域性质
+     */
+    private String airspaceProp;
+
+    /**
+     * 圆半径长度
+     */
+    private String radLength;
+
+
+    /**
+     * 开始时间时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /** 空域范围点 */
+//    @TableField(exist = false)
+    private List<AirspaceWaypoint> airlineWaypointList;
+
+    private String uuid;
+
+    private Long deptId;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirspaceWaypoint.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirspaceWaypoint.java
new file mode 100644
index 0000000..378c823
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/AirspaceWaypoint.java
@@ -0,0 +1,106 @@
+package com.djhk.uav.airspace.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class AirspaceWaypoint {
+    private static final long serialVersionUID = 1L;
+
+    /** 航线航点表主键 */
+    @Excel(name = "参数主键", cellType = Excel.ColumnType.NUMERIC)
+    private Long id;
+
+    /** 航线表主键 */
+    @Excel(name = "航线表主键")
+    private Long airspaceApplyId;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String lng;
+
+    /** 维度 */
+    @Excel(name = "维度")
+    private String lat;
+
+
+
+    /** 是否使用全局高度 */
+//    @Builder.Default
+    private Integer useGlobalHeight = 1;
+
+    /** 高度 */
+//    @Excel(name = "高度")
+    private Double height;
+
+    /** 椭球高度WGS84 1 */
+    private Double ellipsoidHeight = 10.0;
+
+    /** 贴地高度 */
+    private Double floorHeight;
+
+    /** 是否使用全局飞行速度 */
+//    @Builder.Default
+    private Integer useGlobalSpeed = 1;
+
+    /** 航点飞行速度 1 */
+    private Integer speed =1;
+
+    /** 是否使用全局偏航角模式参数 */
+//    @Builder.Default
+    private Integer useGlobalHeadingParam = 1;
+
+    /** 偏航角模式参数 1 */
+    /*followWayline：沿航线方向。飞行器机头沿着航线方向飞至下一航点
+    manually：手动控制。飞行器在飞至下一航点的过程中，用户可以手动控制飞行器机头朝向
+    fixed：锁定当前偏航角。飞行器机头保持执行完航点动作后的飞行器偏航角飞至下一航点
+    smoothTransition：自定义。通过“wpml:waypointHeadingAngle”给定某航点的目标偏航角，并在航段飞行过程中均匀过渡至下一航点的目标偏航角。*/
+//    @Builder.Default
+    private String waypointHeadingMode = "followWayline";
+
+    /** 是否使用全局航点类型（全局航点转弯模式） */
+//    @Builder.Default
+    private Integer useGlobalTurnParam = 1;
+
+    /** 航点类型（航点转弯模式） 1 */
+    /*coordinateTurn：协调转弯，不过点，提前转弯
+    toPointAndStopWithDiscontinuityCurvature：直线飞行，飞行器到点停
+    toPointAndStopWithContinuityCurvature：曲线飞行，飞行器到点停
+    toPointAndPassWithContinuityCurvature：曲线飞行，飞行器过点不停*/
+//    @Builder.Default
+    private String waypointTurnMode = "coordinateTurn";
+
+    /** 航点类型 */
+    @Excel(name = "航点类型")
+    private String type;
+
+    /** 航点类型名称 */
+    @Excel(name = "航点类型名称")
+    private String typeName;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 航点索引 */
+    private Integer seq;
+
+    /** 飞到当前航点偏航角 */
+    private Integer waypointHeadingAngle;
+
+    /** 飞行器旋转方向 */
+   /* clockwise：顺时针旋转飞行器偏航角
+    counterClockwise：逆时针旋转飞行器偏航角
+    followBadArc：沿最短路径旋转飞行器偏航角*/
+//    @Builder.Default
+    private String waypointHeadingPathMode = "followBadArc";
+
+
+    /** 航点转弯截距 1 */
+    private Integer waypointTurnDampingDist = 6;
+
+
+//    @TableField(exist = false)
+    private String wkt;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavInfo.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavInfo.java
new file mode 100644
index 0000000..6c82088
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavInfo.java
@@ -0,0 +1,217 @@
+package com.djhk.uav.airspace.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 无人机信息维护实体 uav_info
+ *
+ * @author jiachengshuai
+ * @date 2022-08-25
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class UavInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 无人机信息表主键 */
+    private Long id;
+
+    /** 企业id */
+    private Long deptId;
+
+    /** 企业名称 */
+    private String deptName;
+
+    /** 无人机编号 */
+    @Excel(name = "无人机编号")
+    private String uavNum;
+
+    /** 无人机子编号 */
+    private String childUavNum;
+
+    /** 无人机名称 */
+    @Excel(name = "无人机名称")
+    private String uavName;
+
+    /** 机号 */
+    @Excel(name = "无人机机号")
+    private String machineNum;
+
+    /** 机型 */
+    @Excel(name = "机型")
+    private String uavType;
+
+    /** 机型名称 */
+    private String uavTypeName;
+
+    /** 子类型 */
+    private Integer subType;
+
+    /** 装载方式 */
+    private Integer loadMode;
+
+    /*domain 表示一个领域，作为一个命名空间，暂时分为：
+    飞机类-0
+    负载类-1
+    遥控器类-2
+    机场类-3*/
+    private Integer domain;
+
+    /** 来源 */
+    private Integer origin;
+
+    /** 机型简介 */
+    @Excel(name = "机型简介")
+    private String briefIntroduction;
+
+    /** 图片路径 */
+//    @Excel(name = "图片路径")
+    private String picture;
+
+    /** 动态模型（文件表id） */
+//    @Excel(name = "动态模型", readConverterExp = "文=件表id")
+    private String dynamicModel;
+
+    /** 静态模型（文件表id） */
+//    @Excel(name = "静态模型", readConverterExp = "文=件表id")
+    private String staticModel;
+
+    /** 状态（待定） */
+//    @Excel(name = "状态", readConverterExp = "待=定")
+    private String uavStatus;
+
+    /** 健康状态 */
+    private String healthStatus;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最大起飞总量 */
+    private String mtow;
+
+    /** 最大可承受风速 */
+    private String maxWindSpeed;
+
+    /** 续航时间 */
+    private String endurance;
+
+    /** 最大飞行高度 */
+    private String ceiling;
+
+    /** 最大续航里程 */
+    private String mileage;
+
+    /** appId */
+    private String appId;
+
+    /** 操作方式  0 在库  1 出库 */
+    private Integer operationMode;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loginTime;
+
+
+    private List<Long> loadIdList;
+
+
+    private String loadId;
+
+    /** 无人机能力 */
+
+    private String abilityName;
+
+    /** 无人机能力集合 */
+
+    private List<String> abilityNames;
+
+ 
+    private Long flightPlanId;
+
+    /** 负载名称（多个已，隔开） */
+ 
+    private String loadName;
+
+    /** 无人机能力集合 */
+ 
+    private List<String> loadNames;
+
+ 
+    private String pictureURL;
+
+ 
+    private Map<String,String> pictureMap;
+
+    /** 动态模型（文件表id） */
+ 
+    private Map<String,String> dynamicModelMap;
+
+    /** 静态模型（文件表id） */
+ 
+    private Map<String,String> staticModelMap;
+
+ 
+    private List<UavInfo> child;
+
+    /** 无人机上线状态 */
+ 
+    private Integer onlineStatus;
+
+    /** 无人机机型名称 */
+ 
+    private String deviceName;
+
+
+    /** 经度 */
+ 
+    private Double longitude;
+
+    /** 纬度 */
+ 
+    private Double latitude;
+
+    /** 计划名称 */
+ 
+    private String flightPlanName;
+
+
+ 
+    private String flightPlanNo;
+
+
+ 
+    private Long orgId;
+
+    private Long createById;
+
+ 
+    private List<Integer> domains;
+
+    @Excel(name = "固件版本号")
+    private String firmwareVersion;
+
+
+ 
+    private Integer parentDomain;
+
+    /** 起飞点经度 */
+    private Double takeOffLongitude;
+
+    /** 起飞点纬度 */
+    private Double takeOffLatitude;
+
+    /** 起飞点海拔高度 */
+    private Double takeOffHeight;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavOperator.java b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavOperator.java
new file mode 100644
index 0000000..a46df54
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/domain/UavOperator.java
@@ -0,0 +1,152 @@
+package com.djhk.uav.airspace.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 飞手管理对象 uav_operator
+ *
+ * @author jiachengshuai
+ * @date 2022-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UavOperator extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 无人机飞手管理表主键 */
+    private Long id;
+
+    /** 用户表主键 */
+    private Long userId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String userName;
+
+    /** 警号 */
+    @Excel(name = "警号")
+    private String policeNo;
+
+    /** 性别（0：男 1：女） */
+    @Excel(name = "性别", readConverterExp = "0=男,1=女")
+    private String sex;
+
+    /** 出生日期 */
+    @Excel(name = "出生日期")
+    private String celebrateDate;
+
+    /** 所属部门 */
+    @Excel(name = "所属部门")
+    private String deptName;
+
+    /** 警察类型（0：民警 1：辅警） */
+    @Excel(name = "警察类型", readConverterExp = "0=民警,1=辅警")
+    private String policeType;
+
+    /** 岗位类型 */
+    @Excel(name = "岗位类型",readConverterExp = "0=警务应用,1=技术防控,2=指挥人员")
+    private String jobType;
+
+    /** 证书类型 */
+    @Excel(name = "证书类型",readConverterExp = "0=警航证书A1,1=警航证书B1,2=警航证书A2,3=警航证书B2,4=警航证书C,5=CAAC固定翼,6=CAAC多旋翼,7=CAAC垂起固定翼,8=CAAC直升机")
+    private String certificateType;
+
+    /** 证书编号 */
+    @Excel(name = "证书编号")
+    private String certificateNo;
+
+    /** 飞手联系方式 */
+    @Excel(name = "飞手联系方式")
+    private String tel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+
+    /** 最后一次执行任务时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @Excel(name = "最后一次执行任务时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planTime;
+
+    private String status;
+
+    /** 邮箱 */
+//    @Excel(name = "邮箱")
+    private String email;
+
+    /** 飞手类型 */
+//    @Excel(name = "飞手类型",readConverterExp = "0=多旋翼飞手,1=固定翼飞手,2=直升机飞手,3=其他")
+    private String operatorType;
+
+    /** 证书名称 */
+//    @Excel(name = "证书名称")
+    private String certificateName;
+
+
+    /** 证书文件id */
+//    @Excel(name = "证书文件id")
+    private String certificateFileId;
+
+    /** 场景分类 */
+//    @Excel(name = "场景分类")
+    private String sceneType;
+
+    /** 场景名称 */
+//    @Excel(name = "场景名称")
+    private String sceneName;
+
+    /** 应用id */
+    private String appId;
+
+    /** 组织id */
+    private Long orgId;
+
+    /** 圖片url */
+    private String picUrl;
+
+    private List<String> celebrateDateRage;
+
+    /** 能力名称 */
+  
+    private String abilityName;
+
+    /** 能力名称 */
+  
+    private String appName;
+
+  
+    private List<String> abilityNameList;
+    
+
+  
+    private Map<String,String> certificateMap;
+
+  
+    private MultipartFile file;
+
+  
+    private String certificateFilePath;
+
+  
+    private List<String> operatorTypeList;
+
+  
+    private List<String> operatorTypes;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneAirspaceMapper.java b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneAirspaceMapper.java
new file mode 100644
index 0000000..348c0ea
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneAirspaceMapper.java
@@ -0,0 +1,38 @@
+package com.djhk.uav.airspace.mapper;
+
+
+
+
+import com.djhk.uav.airspace.domain.AirplaneApplyAirspace;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AirplaneAirspaceMapper {
+
+
+    /**
+     * 查询飞行申请空域列表
+     * @return 飞行申请空域集合
+     */
+    public List<AirplaneApplyAirspace> selectAirplaneAirspaceApplyList(Long airplaneApplyId);
+
+    /**
+     * 新增飞行申请空域
+     *
+     * @param airplaneApply 飞行申请空域
+     * @return 结果
+     */
+    public int insertAirplaneAirspaceApply(AirplaneApplyAirspace airplaneApply);
+
+
+    /**
+     * 删除飞行申请空域
+     *
+     * @param airplaneApplyId 飞行申请空域主键
+     * @return 结果
+     */
+    public int deleteAirplaneAirspaceApplyByAirspaceId(Long airplaneApplyId);
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneFlyMapper.java b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneFlyMapper.java
new file mode 100644
index 0000000..e491936
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneFlyMapper.java
@@ -0,0 +1,38 @@
+package com.djhk.uav.airspace.mapper;
+
+
+
+
+import com.djhk.uav.airspace.domain.AirplaneApplyAirplane;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AirplaneFlyMapper {
+
+
+    /**
+     * 查询飞行申请飞行器列表
+     * @return 飞行申请飞行器集合
+     */
+    public List<AirplaneApplyAirplane> selectAirplaneFlyApplyList(Long airplaneApplyId);
+
+    /**
+     * 新增飞行申请飞行器
+     *
+     * @param airplaneApply 飞行申请飞行器
+     * @return 结果
+     */
+    public int insertAirplaneFlyApply(AirplaneApplyAirplane airplaneApply);
+
+
+    /**
+     * 删除飞行申请飞行器
+     *
+     * @param airplaneApplyId 飞行申请飞行器主键
+     * @return 结果
+     */
+    public int deleteAirplaneFlyApplyByFlyId(Long airplaneApplyId);
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneMapper.java b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneMapper.java
new file mode 100644
index 0000000..ac7162e
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneMapper.java
@@ -0,0 +1,67 @@
+package com.djhk.uav.airspace.mapper;
+
+
+
+import com.djhk.uav.airspace.domain.AirplaneApply;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AirplaneMapper {
+
+    /**
+     * 查询飞行申请
+     *
+     * @param id 飞行申请主键
+     * @return 飞行申请
+     */
+    public AirplaneApply selectAirplaneApplyById(Long id);
+
+    /**
+     * 查询飞行申请的最新id
+     *
+     * @return id 飞行申请主键
+     */
+    public AirplaneApply selectAirplaneApplyId();
+
+
+    /**
+     * 查询飞行申请列表
+     * @return 飞行申请集合
+     */
+    public List<AirplaneApply> selectAirplaneApplyList(AirplaneApply airplaneApply);
+    public List<AirplaneApply> selectAirplaneApplyLists(AirplaneApply airplaneApply);
+
+    /**
+     * 新增飞行申请
+     *
+     * @param airplaneApply 飞行申请
+     * @return 结果
+     */
+    public int insertAirplaneApply(AirplaneApply airplaneApply);
+
+    /**
+     * 修改飞行申请
+     *
+     * @param airplaneApply 飞行申请
+     * @return 结果
+     */
+    public int updateAirplaneApply(AirplaneApply airplaneApply);
+
+    /**
+     * 删除飞行申请
+     *
+     * @param id 飞行申请主键
+     * @return 结果
+     */
+    public int deleteAirplaneApplyById(Long id);
+
+    /**
+     * 批量删除飞行申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAirplaneApplyByIds(Long[] ids);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneOperatorMapper.java b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneOperatorMapper.java
new file mode 100644
index 0000000..12577a4
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirplaneOperatorMapper.java
@@ -0,0 +1,37 @@
+package com.djhk.uav.airspace.mapper;
+
+
+
+import com.djhk.uav.airspace.domain.AirplaneApplyOperator;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AirplaneOperatorMapper {
+
+
+    /**
+     * 查询飞行申请飞手列表
+     * @return 飞行申请飞手集合
+     */
+    public List<AirplaneApplyOperator> selectAirplaneOperatorApplyList(Long airplaneApplyId);
+
+    /**
+     * 新增飞行申请飞手
+     *
+     * @param airplaneApply 飞行申请飞手
+     * @return 结果
+     */
+    public int insertAirplaneOperatorApply(AirplaneApplyOperator airplaneApply);
+
+
+    /**
+     * 删除飞行申请飞手
+     *
+     * @param airplaneApplyOperatorId 飞行申请飞手主键
+     * @return 结果
+     */
+    public int deleteAirplaneApplyByOperatorId(Long airplaneApplyOperatorId);
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirspaceMapper.java b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirspaceMapper.java
new file mode 100644
index 0000000..68ecd3a
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirspaceMapper.java
@@ -0,0 +1,66 @@
+package com.djhk.uav.airspace.mapper;
+
+
+
+import com.djhk.uav.airspace.domain.AirspaceApply;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AirspaceMapper {
+
+    /**
+     * 查询空域申请
+     *
+     * @param id 空域申请主键
+     * @return 空域申请
+     */
+    public AirspaceApply selectAirspaceApplyById(Long id);
+
+    /**
+     * 查询空域申请
+     *
+     * @return id 空域申请主键
+     */
+    public Long selectAirspaceApplyId();
+
+
+    /**
+     * 查询空域申请列表
+     * @return 空域申请集合
+     */
+    public List<AirspaceApply> selectAirspaceApplyList(AirspaceApply airspaceApply);
+
+    /**
+     * 新增空域申请
+     *
+     * @param airspaceApply 空域申请
+     * @return 结果
+     */
+    public int insertAirspaceApply(AirspaceApply airspaceApply);
+
+    /**
+     * 修改空域申请
+     *
+     * @param airspaceApply 空域申请
+     * @return 结果
+     */
+    public int updateAirspaceApply(AirspaceApply airspaceApply);
+
+    /**
+     * 删除空域申请
+     *
+     * @param id 空域申请主键
+     * @return 结果
+     */
+    public int deleteAirspaceApplyById(Long id);
+
+    /**
+     * 批量删除空域申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAirspaceApplyByIds(Long[] ids);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirspaceWaypointMapper.java b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirspaceWaypointMapper.java
new file mode 100644
index 0000000..ab1e1c9
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/mapper/AirspaceWaypointMapper.java
@@ -0,0 +1,49 @@
+package com.djhk.uav.airspace.mapper;
+
+
+import com.djhk.uav.airspace.domain.AirspaceWaypoint;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AirspaceWaypointMapper{
+    /**
+     * 查询空域申请
+     *
+     * @param id 空域申请主键
+     * @return 空域申请
+     */
+    public AirspaceWaypoint selectAirspaceWaypointById(Long id);
+
+    /**
+     * 查询空域申请列表
+     * @return 空域申请集合
+     */
+    public List<AirspaceWaypoint> selectAirspaceWaypointList(Long airspaceApplyId);
+
+    /**
+     * 新增空域申请
+     *
+     * @param AirspaceWaypoint 空域申请
+     * @return 结果
+     */
+    public int insertAirspaceWaypoint(AirspaceWaypoint AirspaceWaypoint);
+
+
+    /**
+     * 删除空域申请
+     *
+     * @param id 空域申请主键
+     * @return 结果
+     */
+    public int deleteAirspaceWaypointById(Long id);
+
+    /**
+     * 批量删除空域申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAirspaceWaypointByIds(Long[] ids);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirplaneService.java b/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirplaneService.java
new file mode 100644
index 0000000..f52e87d
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirplaneService.java
@@ -0,0 +1,75 @@
+package com.djhk.uav.airspace.service;
+
+
+
+import com.djhk.uav.airspace.domain.AirplaneApply;
+import com.djhk.uav.airspace.domain.AirplaneApplyExport;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+public interface AirplaneService {
+
+    /**
+     * 查询空域申请
+     *
+     * @param id 空域申请主键
+     * @return 空域申请
+     */
+    public AirplaneApply selectAirplaneApplyById(Long id);
+
+    /**
+     * 查询才新增申请的id
+     * @return
+     */
+//    public Long selectAirplaneApplyId();
+
+    /**
+     * 查询空域申请列表
+     *
+     * @return 空域申请集合
+     */
+    public List<AirplaneApply> selectAirplaneApplyList(AirplaneApply airplaneApply);
+
+    /**
+     * 导出空域申请列表
+     *
+     * @return 导出空域申请集合
+     */
+    public List<AirplaneApplyExport> exportAirplaneApplyList(AirplaneApply airplaneApply);
+
+
+    public void exportAirplaneApply(HttpServletResponse response, Long id) throws Exception;
+
+    /**
+     * 新增空域申请
+     *
+     * @param airplaneApply 空域申请
+     * @return 结果
+     */
+    public int insertAirplaneApply(AirplaneApply airplaneApply);
+
+    /**
+     * 修改空域申请
+     *
+     * @param airplaneApply 空域申请
+     * @return 结果
+     */
+    public int updateAirplaneApply(AirplaneApply airplaneApply);
+
+    /**
+     * 删除空域申请
+     *
+     * @param id 空域申请主键
+     * @return 结果
+     */
+    public int deleteAirplaneApplyById(Long id);
+
+    /**
+     * 批量删除空域申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAirplaneApplyByIds(Long[] ids);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirspaceService.java b/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirspaceService.java
new file mode 100644
index 0000000..2fd5b3b
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirspaceService.java
@@ -0,0 +1,58 @@
+package com.djhk.uav.airspace.service;
+
+
+import com.djhk.uav.airspace.domain.AirspaceApply;
+
+import java.util.List;
+
+public interface AirspaceService {
+
+    /**
+     * 查询空域申请
+     *
+     * @param id 空域申请主键
+     * @return 空域申请
+     */
+    public AirspaceApply selectAirspaceApplyById(Long id);
+
+    public Long selectAirspaceApplyId();
+
+    /**
+     * 查询空域申请列表
+     *
+     * @return 空域申请集合
+     */
+    public List<AirspaceApply> selectAirspaceApplyList(AirspaceApply airspaceApply);
+
+    /**
+     * 新增空域申请
+     *
+     * @param airspaceApply 空域申请
+     * @return 结果
+     */
+    public int insertAirspaceApply(AirspaceApply airspaceApply);
+
+    /**
+     * 修改空域申请
+     *
+     * @param airspaceApply 空域申请
+     * @return 结果
+     */
+    public int updateAirspaceApply(AirspaceApply airspaceApply);
+
+    /**
+     * 删除空域申请
+     *
+     * @param id 空域申请主键
+     * @return 结果
+     */
+    public int deleteAirspaceApplyById(Long id);
+
+    /**
+     * 批量删除空域申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAirspaceApplyByIds(Long[] ids);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirspaceWaypointService.java b/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirspaceWaypointService.java
new file mode 100644
index 0000000..1d519ad
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/service/AirspaceWaypointService.java
@@ -0,0 +1,48 @@
+package com.djhk.uav.airspace.service;
+
+
+import com.djhk.uav.airspace.domain.AirspaceWaypoint;
+
+import java.util.List;
+
+public interface AirspaceWaypointService {
+
+    /**
+     * 查询空域申请
+     *
+     * @param id 空域申请主键
+     * @return 空域申请
+     */
+    public AirspaceWaypoint selectAirspaceWaypointById(Long id);
+
+    /**
+     * 查询空域申请列表
+     *
+     * @return 空域申请集合
+     */
+    public List<AirspaceWaypoint> selectAirspaceWaypointList(Long airspaceApplyId);
+
+    /**
+     * 新增空域申请
+     *
+     * @param AirspaceWaypoint 空域申请
+     * @return 结果
+     */
+    public int insertAirspaceWaypoint(AirspaceWaypoint AirspaceWaypoint);
+
+    /**
+     * 删除空域申请
+     *
+     * @param id 空域申请主键
+     * @return 结果
+     */
+    public int deleteAirspaceWaypointById(Long id);
+
+    /**
+     * 批量删除空域申请
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAirspaceWaypointByIds(Long[] ids);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirplaneImpl.java b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirplaneImpl.java
new file mode 100644
index 0000000..3c50b42
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirplaneImpl.java
@@ -0,0 +1,617 @@
+package com.djhk.uav.airspace.service.impl;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.djhk.common.core.domain.entity.SysDept;
+import com.djhk.common.core.domain.entity.SysDictData;
+import com.djhk.common.core.domain.entity.SysUser;
+import com.djhk.common.utils.DictUtils;
+import com.djhk.common.utils.SecurityUtils;
+import com.djhk.common.utils.StringUtils;
+import com.djhk.system.service.ISysDeptService;
+import com.djhk.system.service.ISysUserService;
+import com.djhk.uav.airspace.domain.*;
+import com.djhk.uav.airspace.mapper.AirplaneAirspaceMapper;
+import com.djhk.uav.airspace.mapper.AirplaneFlyMapper;
+import com.djhk.uav.airspace.mapper.AirplaneMapper;
+import com.djhk.uav.airspace.mapper.AirplaneOperatorMapper;
+import com.djhk.uav.airspace.service.AirplaneService;
+import com.djhk.uav.airspace.service.AirspaceService;
+import com.djhk.uav.airspace.service.AirspaceWaypointService;
+import com.djhk.uav.equ.domain.EquInfoEntity;
+import com.djhk.uav.equ.service.EquInfoService;
+import com.djhk.uav.label.domain.Plotting;
+import com.djhk.uav.label.mapper.PlottingMappers;
+import com.djhk.uav.label.service.LabelService;
+import com.djhk.uav.uav.service.IUavOperatorService;
+//import com.djhk.uav.utils.ExportWord;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+//import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class AirplaneImpl implements AirplaneService {
+
+    @Autowired
+    private AirplaneMapper airplaneMapper;
+    @Autowired
+    private AirplaneFlyMapper airplaneFlyMapper;
+    @Autowired
+    private AirplaneAirspaceMapper airspaceMapper;
+    @Autowired
+    private AirplaneOperatorMapper airplaneOperatorMapper;
+    @Resource
+    private IUavOperatorService uavOperatorService;
+//    @Autowired
+//    private RemoteDeptService remoteDeptService;
+
+    @Autowired
+    private ISysDeptService deptService;
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private EquInfoService equInfoService;
+//    @Autowired
+//    private RemoteUserService userService;
+    @Resource
+    private AirspaceService airspaceService;
+    @Resource
+    private AirspaceWaypointService airspaceWaypointService;
+//    @Autowired
+//    FreeMarkerConfigurer freeMarkerConfigurer;
+    @Autowired
+    private LabelService labelService;
+    @Autowired
+    private PlottingMappers plottingMapper;
+
+
+
+
+
+
+    /**
+     * 跟根据id查询申请详情
+     * @param id 空域申请主键
+     * @return
+     */
+    @Override
+    public AirplaneApply selectAirplaneApplyById(Long id) {
+        AirplaneApply airplaneApply = airplaneMapper.selectAirplaneApplyById(id);
+//        SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//        Boolean S= "admin".equals(sysUser.getUserName());
+        if ("admin".equals(SecurityUtils.getUsername()) || "CQSGAJ".equals(SecurityUtils.getUsername())){
+            airplaneApply.setIsShowStatus(true);
+        }else {
+            airplaneApply.setIsShowStatus(false);
+        }
+        List<String> equCodes = new ArrayList<>();
+        // 根据飞行申请查询该飞行申请的关联飞行器主键
+        List<AirplaneApplyAirplane> airplaneApplyAirplanes = airplaneFlyMapper.selectAirplaneFlyApplyList(id);
+        for (int i = 0; i < airplaneApplyAirplanes.size(); i++) {
+            EquInfoEntity equInfoEntity = equInfoService.selectEquInfoById(airplaneApplyAirplanes.get(i).getAirplaneId().toString());
+
+            if (equInfoEntity != null) {
+                try {
+                    List<SysDictData> sysDictDataList = DictUtils.getDictDataByType("equ_model_info");
+
+                        // modelId转
+                        if (sysDictDataList != null) {
+                            for (SysDictData sysDictData : sysDictDataList) {
+                                if (StringUtils.equals(equInfoEntity.getModelId(), String.valueOf(sysDictData.getDictValue()))) {
+                                    equInfoEntity.setModelId(sysDictData.getDictLabel());
+                                    break;
+                                }
+                            }
+                        }
+
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+
+            }
+            equCodes.add(equInfoEntity.getModelId());
+        }
+        airplaneApply.setUavInfoName(equCodes);
+        // 根据飞行申请查询该飞行申请的关联飞手主键
+        List<String> uavOperators = new ArrayList<>();
+        List<AirplaneApplyOperator> airplaneApplyOperators = airplaneOperatorMapper.selectAirplaneOperatorApplyList(id);
+        for (int i = 0; i < airplaneApplyOperators.size(); i++) {
+            UavOperator uavOperator = uavOperatorService.selectUavOperatorById(airplaneApplyOperators.get(i).getOperatorId());
+            uavOperators.add(uavOperator.getUserName());
+        }
+        airplaneApply.setUavOperatorName(uavOperators);
+        // 根据飞行申请查询该飞行申请的关联空域
+        List<String> airspaces = new ArrayList<>();
+        List<AirplaneApplyAirspace> airplaneApplyAirspaces = airspaceMapper.selectAirplaneAirspaceApplyList(id);
+        for (int i = 0; i < airplaneApplyAirspaces.size(); i++) {
+            AirspaceApply airspaceApply = airspaceService.selectAirspaceApplyById(airplaneApplyAirspaces.get(i).getAirspaceId());
+            airspaces.add(airspaceApply.getName());
+        }
+        airplaneApply.setAirspaceName(airspaces);
+        return airplaneApply;
+    }
+
+
+    /**
+     * 查询才新增申请的id
+     * @return
+     */
+//    @Override
+//    public Long selectAirplaneApplyId() {
+//        return airplaneMapper.selectAirplaneApplyId();
+//    }
+
+
+    /**
+     * 查询列表
+     * @param airplaneApply
+     * @return
+     */
+    @Override
+    public List<AirplaneApply> selectAirplaneApplyList(AirplaneApply airplaneApply) {
+        List<AirplaneApply> list = airplaneMapper.selectAirplaneApplyList(airplaneApply);
+        if (list.size()>0){
+            for (int i = 0; i < list.size(); i++) {
+//                SysDept dept = remoteDeptService.getDeptInfo(list.get(i).getDeptId() , "inner").getData();
+//                SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+                SysDept dept = deptService.selectDeptById(list.get(i).getDeptId());
+                list.get(i).setDept(dept);
+                if (list.get(i).getCreateBy() ==  SecurityUtils.getUsername() && list.get(i).getSts().equals("4")){
+                    list.get(i).setHandle("1");
+                }
+                if (SecurityUtils.getDeptId() == 1L){
+                    list.get(i).setHandle("1");
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public void exportAirplaneApply(HttpServletResponse response, Long id) throws Exception {
+
+        AirplaneApply apply = airplaneMapper.selectAirplaneApplyById(id);
+        Map<String, Object> dataMap = new HashMap<>();
+        // 部门名称
+//        SysDept dept = remoteDeptService.getDeptInfo(apply.getDeptId(), "inner").getData();
+//        dataMap.put("deptName",dept.getDeptName());
+        SysDept dept = deptService.selectDeptById(SecurityUtils.getDeptId());
+        dataMap.put("deptName",dept.getDeptName());
+        // 任务性质 0=飞行任务,1=飞行训练
+        if(apply.getTaskProp()=="0"){
+            dataMap.put("taskProp","飞行任务");
+        }else {
+            dataMap.put("taskProp","飞行训练");
+        }
+        // 申请飞手
+        List<String> uavOperators = new ArrayList<>();
+        List<AirplaneApplyOperator> airplaneApplyOperators = airplaneOperatorMapper.selectAirplaneOperatorApplyList(apply.getId());
+        String operator = null;
+        if (airplaneApplyOperators.size()>0){
+            for (int i = 0; i < airplaneApplyOperators.size(); i++) {
+                UavOperator uavOperator = uavOperatorService.selectUavOperatorById(airplaneApplyOperators.get(i).getOperatorId());
+                uavOperators.add(uavOperator.getUserName()+":"+uavOperator.getTel());
+                if (operator==null){
+                    operator = uavOperator.getUserName()+":"+uavOperator.getTel()+",";
+                }else {
+                    operator = operator+uavOperator.getUserName()+":"+uavOperator.getTel()+",";
+                }
+            }
+        }
+//        dataMap.put("operator",uavOperators.toString());
+        dataMap.put("operator",operator);
+        // 申请无人机
+        // 根据飞行申请查询该飞行申请的关联飞行器主键
+        List<String> equCode = new ArrayList<>();
+        List<AirplaneApplyAirplane> airplaneApplyAirplanes = airplaneFlyMapper.selectAirplaneFlyApplyList(apply.getId());
+        String equ =null;
+        if (airplaneApplyAirplanes.size()>0){
+            for (int i = 0; i < airplaneApplyAirplanes.size(); i++) {
+                EquInfoEntity equInfoEntity = equInfoService.selectEquInfoById(airplaneApplyAirplanes.get(i).getAirplaneId().toString());
+                if (equInfoEntity != null) {
+                    try {
+                        List<SysDictData> sysDictDataList = DictUtils.getDictDataByType("equ_model_info");
+
+                        // modelId转
+                        if (sysDictDataList != null) {
+                            for (SysDictData sysDictData : sysDictDataList) {
+                                if (StringUtils.equals(equInfoEntity.getModelId(), String.valueOf(sysDictData.getDictValue()))) {
+                                    equInfoEntity.setModelId(sysDictData.getDictLabel());
+                                    break;
+                                }
+                            }
+                        }
+
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+
+                }
+                equCode.add(equInfoEntity.getModelId()+":"+equInfoEntity.getEquSn());
+                if (equ==null){
+                    equ=equInfoEntity.getModelId()+":"+equInfoEntity.getEquSn()+",";
+                }else {
+                    equ=equInfoEntity.getModelId()+":"+equInfoEntity.getEquSn()+","+equ;
+                }
+
+            }
+        }
+
+//        dataMap.put("uav",equCode.toString());
+        dataMap.put("uav",equ);
+
+
+        // 申请空域
+        List<String> location = new ArrayList<>();
+        List<String> planBeg = new ArrayList<>();
+        List<String> planEnd = new ArrayList<>();
+        List<String> heightMin = new ArrayList<>();
+        List<String> heightMax = new ArrayList<>();
+        String rad = null;
+        List<AirplaneApplyAirspace> airplaneApplyAirspaces = airspaceMapper.selectAirplaneAirspaceApplyList(apply.getId());
+        if (airplaneApplyAirspaces.size()>0){
+            for (int i = 0; i < airplaneApplyAirspaces.size(); i++) {
+                AirspaceApply airspaceApply = airspaceService.selectAirspaceApplyById(airplaneApplyAirspaces.get(i).getAirspaceId());
+                planBeg.add(airspaceApply.getPlanBeg());
+                planEnd.add(airspaceApply.getPlanEnd());
+                heightMin.add(airspaceApply.getHightMin());
+                heightMax.add(airspaceApply.getHightMax());
+                Plotting plotting = plottingMapper.selectPlottingByUUId(airspaceApply.getUuid());
+                JSONObject json = JSONObject.parseObject(plotting.getData());
+                JSONArray jsonArray = json.getJSONObject("geometry").getJSONArray("coordinates");
+                if(("1").equals(airspaceApply.getAirspaceType())){
+                    Object jsonRad = json.getJSONObject("properties").getJSONObject("style").get("radius");
+                    if (rad ==null){
+                        rad="以("+jsonArray.get(0)+","+jsonArray.get(1)+")为圆心,半径为"+jsonRad+"米的圆形区域,";
+                    }else {
+                        rad=rad+"以("+jsonArray.get(0)+","+jsonArray.get(1)+")为圆心,半径为"+jsonRad+"米的圆形区域,";
+                    }
+//                    if (rad ==null){
+//                        rad="以("+airspaceApply.getLng()+","+airspaceApply.getLat()+")为圆心,半径为"+airspaceApply.getRadLength()+"米的圆形区域,";
+//                    }else {
+//                        rad=rad+"以("+airspaceApply.getLng()+","+airspaceApply.getLat()+")为圆心,半径为"+airspaceApply.getRadLength()+"米的圆形区域,";
+//                    }
+                }else {
+                    String loc ="";
+                    for (int i1 = 0; i1 < jsonArray.getJSONArray(0).size(); i1++) {
+                        Object Lng = jsonArray.getJSONArray(0).getJSONArray(i1).get(0);
+                        Object Lat = jsonArray.getJSONArray(0).getJSONArray(i1).get(1);
+                        loc =loc +"("+Lng+","+Lat+"),";
+                    }
+                    if (rad == null) {
+                        rad =loc+"前述点连线范围内部区域,";
+                    }else {
+                        rad =loc+"前述点连线范围内部区域,"+rad;
+                    }
+
+
+
+//                    List<AirspaceWaypoint> airspaceWaypoints = airspaceWaypointService.selectAirspaceWaypointList(airspaceApply.getId());
+//                    String loc = "("+airspaceApply.getLng()+","+airspaceApply.getLat()+"),";
+//                    if (airspaceWaypoints.size()>0){
+//                        for (AirspaceWaypoint airspaceWaypoint : airspaceWaypoints) {
+//                            loc =loc +"("+airspaceWaypoint.getLng()+","+airspaceWaypoint.getLat()+"),";
+//                        }
+//                        if (rad == null) {
+//                            rad =loc+"前述点连线范围内部区域,";
+//                        }else {
+//                            rad =loc+"前述点连线范围内部区域,"+rad;
+//                        }
+//                    }
+                }
+
+            }
+        }
+        dataMap.put("airspace",rad);
+
+        // 计划时间
+        // 计划起飞时间
+        apply.getFlyTime();
+        dataMap.put("time","开始时间:"+planBeg.get(0).toString()+",结束时间:"+planEnd.get(0).toString());
+        dataMap.put("height","0~~~"+heightMax.get(0)+"米");
+
+
+//        new ExportWord("UTF-8").exportDoc(response, "申请空域", "airspaceApply.ftl", dataMap, freeMarkerConfigurer);
+    }
+
+
+    /**
+     * 导出列表
+     * @param airplaneApply
+     * @return
+     */
+    @Override
+    public List<AirplaneApplyExport> exportAirplaneApplyList(AirplaneApply airplaneApply) {
+        List<AirplaneApplyExport> listAirplaneApply=new ArrayList<>();
+        List<AirplaneApply> list = airplaneMapper.selectAirplaneApplyList(airplaneApply);
+
+
+        if (list.size()>0){
+            for (AirplaneApply apply : list) {
+                AirplaneApplyExport airplaneApplyExport = new AirplaneApplyExport();
+                // 主键
+                airplaneApplyExport.setId(apply.getId());
+                // 部门名称
+//                SysDept dept = remoteDeptService.getDeptInfo(apply.getDeptId() , "inner").getData();
+                SysDept dept = deptService.selectDeptById(apply.getDeptId());
+                airplaneApplyExport.setDeptName(dept.getDeptName());
+                // 飞行申请名称
+                airplaneApplyExport.setName(apply.getName());
+                // 申请状态
+                airplaneApplyExport.setSts(apply.getSts());
+                // 任务性质
+                airplaneApplyExport.setTaskProp(apply.getTaskProp());
+                // 申请无人机
+                // 根据飞行申请查询该飞行申请的关联飞行器主键
+                List<String> equCode = new ArrayList<>();
+                List<AirplaneApplyAirplane> airplaneApplyAirplanes = airplaneFlyMapper.selectAirplaneFlyApplyList(apply.getId());
+                for (int i = 0; i < airplaneApplyAirplanes.size(); i++) {
+                    EquInfoEntity equInfoEntity = equInfoService.selectEquInfoById(airplaneApplyAirplanes.get(i).getAirplaneId().toString());
+                    equCode.add(equInfoEntity.getEquCode()+":"+equInfoEntity.getEquSn()+":"+equInfoEntity.getModelId());
+                }
+                airplaneApplyExport.setUavInfoNames(equCode.toString());
+                // 申请空域
+                List<String> airspaceName = new ArrayList<>();
+                List<String> location = new ArrayList<>();
+                List<String> planBeg = new ArrayList<>();
+                List<String> planEnd = new ArrayList<>();
+                List<String> heightMin = new ArrayList<>();
+                List<String> heightMax = new ArrayList<>();
+                List<AirplaneApplyAirspace> airplaneApplyAirspaces = airspaceMapper.selectAirplaneAirspaceApplyList(apply.getId());
+                for (int i = 0; i < airplaneApplyAirspaces.size(); i++) {
+                    AirspaceApply airspaceApply = airspaceService.selectAirspaceApplyById(airplaneApplyAirspaces.get(i).getAirspaceId());
+                    airspaceName.add(airspaceApply.getName());
+                    planBeg.add(airspaceApply.getPlanBeg());
+                    planEnd.add(airspaceApply.getPlanEnd());
+                    heightMin.add(airspaceApply.getHightMin());
+                    heightMax.add(airspaceApply.getHightMax());
+                    List<AirspaceWaypoint> airspaceWaypoints = airspaceWaypointService.selectAirspaceWaypointList(airspaceApply.getId());
+                    for (AirspaceWaypoint airspaceWaypoint : airspaceWaypoints) {
+                        String loc ="("+airspaceWaypoint.getLng()+","+airspaceWaypoint.getLat()+")";
+                        location.add(loc);
+                    }
+                }
+                // 空域名称
+                airplaneApplyExport.setAirspaceNames(airspaceName.toString());
+                // 空域经纬度
+                airplaneApplyExport.setLocation(location.toString());
+                // 空域开始时间
+                airplaneApplyExport.setPlanBeg(planBeg.toString());
+                // 空域结束时间
+                airplaneApplyExport.setPlanEnd(planEnd.toString());
+                if (heightMin.size()>0){
+                    // 空域最高高度
+                    Double maxH = 0.0;
+                    for (int i = 0; i < heightMax.size(); i++) {
+                    }
+                    airplaneApplyExport.setHeightMax(heightMax.get(0));
+                    // 空域最低高度
+                    airplaneApplyExport.setHeightMin(heightMin.get(0));
+                }
+                // 申请飞手
+                List<String> uavOperators = new ArrayList<>();
+                List<AirplaneApplyOperator> airplaneApplyOperators = airplaneOperatorMapper.selectAirplaneOperatorApplyList(apply.getId());
+                for (int i = 0; i < airplaneApplyOperators.size(); i++) {
+                    UavOperator uavOperator = uavOperatorService.selectUavOperatorById(airplaneApplyOperators.get(i).getOperatorId());
+                    uavOperators.add(uavOperator.getUserName()+"-"+uavOperator.getPoliceNo());
+                }
+                airplaneApplyExport.setUavOperatorNames(uavOperators.toString());
+
+                listAirplaneApply.add(airplaneApplyExport);
+            }
+        }
+        return listAirplaneApply;
+    }
+
+
+    /**
+     * 新增
+     * @param airplaneApply 空域申请
+     * @return
+     */
+    @Override
+    public int insertAirplaneApply(AirplaneApply airplaneApply) {
+        int i= airplaneMapper.insertAirplaneApply(airplaneApply);
+        Long maxId = airplaneMapper.selectAirplaneApplyId().getId();
+        // 根据飞行申请新增该飞行申请的关联飞行器主键
+//        for (UavInfo uavInfo : airplaneApply.getUavInfos()) {
+//            AirplaneApplyAirplane airplaneApplyAirplane = null;
+//            airplaneApplyAirplane.setAirplaneApplyId(applyId);
+//            airplaneApplyAirplane.setAirplaneId(uavInfo.getId());
+//            airplaneFlyMapper.insertAirplaneFlyApply(airplaneApplyAirplane);
+//        }
+//        for (String uavName : airplaneApply.getUavInfoName()) {
+//            EquInfoEntity equInfoEntity = new EquInfoEntity();
+//            equInfoEntity.setModelId(uavName);
+//            log.info("uavName的值==============:{}",uavName);
+////            List<EquInfoEntity> list = equInfoService.getEquInfoLists(equInfoEntity);
+//            List<EquInfoEntity> list = equInfoService.getEquInfos(equInfoEntity);
+//            log.info("list返回的值==============:{}",list);
+//            Long euqId = Long.valueOf(list.get(0).getEquId());
+//            AirplaneApplyAirplane airplaneApplyAirplane = new AirplaneApplyAirplane();
+//            airplaneApplyAirplane.setAirplaneApplyId(maxId);
+//            airplaneApplyAirplane.setAirplaneId(euqId);
+//            airplaneFlyMapper.insertAirplaneFlyApply(airplaneApplyAirplane);
+//        }
+        for (String equCode : airplaneApply.getAirUAV()) {
+            EquInfoEntity equInfoEntity = new EquInfoEntity();
+            equInfoEntity.setEquCode(equCode);
+            log.info("equCode的值==============:{}",equCode);
+//            List<EquInfoEntity> list = equInfoService.getEquInfoLists(equInfoEntity);
+            List<EquInfoEntity> list = equInfoService.getEquInfos(equInfoEntity);
+            log.info("list返回的值==============:{}",list);
+            if (list.size()>0){
+                Long euqId = Long.valueOf(list.get(0).getEquId());
+                AirplaneApplyAirplane airplaneApplyAirplane = new AirplaneApplyAirplane();
+                airplaneApplyAirplane.setAirplaneApplyId(maxId);
+                airplaneApplyAirplane.setAirplaneId(euqId);
+                airplaneFlyMapper.insertAirplaneFlyApply(airplaneApplyAirplane);
+            }
+
+        }
+        // 根据飞行申请新增该飞行申请的关联飞手主键
+//        for (UavOperator uavOperator : airplaneApply.getUavOperators()) {
+//            AirplaneApplyOperator airplaneApplyOperator = null;
+//            airplaneApplyOperator.setAirplaneApplyId(applyId);
+//            airplaneApplyOperator.setOperatorId(uavOperator.getId());
+//            airplaneOperatorMapper.insertAirplaneOperatorApply(airplaneApplyOperator);
+//        }
+        for (String uavOperatorName : airplaneApply.getUavOperatorName()) {
+            UavOperator uavOperator = new UavOperator();
+//            SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//            Long deptId = sysUser.getDeptId();
+            Long deptId = SecurityUtils.getDeptId();
+            uavOperator.setOrgId(deptId);
+            uavOperator.setUserName(uavOperatorName);
+            List<UavOperator> list = uavOperatorService.selectUavOperatorList(uavOperator);
+            AirplaneApplyOperator airplaneApplyOperator = new AirplaneApplyOperator();
+            airplaneApplyOperator.setAirplaneApplyId(maxId);
+            airplaneApplyOperator.setOperatorId(list.get(0).getId());
+            airplaneOperatorMapper.insertAirplaneOperatorApply(airplaneApplyOperator);
+        }
+        // 根据飞行申请新增该飞行申请的关联空域主键
+//        for (AirspaceApply airspaceApply : airplaneApply.getAirspaceApplies()) {
+//            AirplaneApplyAirspace airplaneApplyAirspace = null;
+//            airplaneApplyAirspace.setAirplaneApplyId(applyId);
+//            airplaneApplyAirspace.setAirspaceId(airspaceApply.getId());
+//            airspaceMapper.insertAirplaneAirspaceApply(airplaneApplyAirspace);
+//        }
+        for (String airspaceName : airplaneApply.getAirspaceName()) {
+            AirspaceApply airspaceApply = new AirspaceApply();
+//            SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//            airspaceApply.setCreateBy(sysUser.getUserName());
+            airspaceApply.setName(airspaceName);
+            List<AirspaceApply> list = airspaceService.selectAirspaceApplyList(airspaceApply);
+            AirplaneApplyAirspace airplaneApplyAirspace = new AirplaneApplyAirspace();
+            airplaneApplyAirspace.setAirplaneApplyId(maxId);
+            airplaneApplyAirspace.setAirspaceId(list.get(0).getId());
+            airspaceMapper.insertAirplaneAirspaceApply(airplaneApplyAirspace);
+        }
+        return i;
+    }
+
+    /**
+     * 根据id更细数据
+     * @param airplaneApply 空域申请
+     * @return
+     */
+    @Override
+    public int updateAirplaneApply(AirplaneApply airplaneApply) {
+        // 先删除原有的关联数据
+        airplaneFlyMapper.deleteAirplaneFlyApplyByFlyId(airplaneApply.getId());
+        airplaneOperatorMapper.deleteAirplaneApplyByOperatorId(airplaneApply.getId());
+        airspaceMapper.deleteAirplaneAirspaceApplyByAirspaceId(airplaneApply.getId());
+        // 根据飞行申请新增该飞行申请的关联飞行器主键
+//        for (UavInfo uavInfo : airplaneApply.getUavInfos()) {
+//            AirplaneApplyAirplane airplaneApplyAirplane = null;
+//            airplaneApplyAirplane.setAirplaneApplyId(airplaneApply.getId());
+//            airplaneApplyAirplane.setAirplaneId(uavInfo.getId());
+//            airplaneFlyMapper.insertAirplaneFlyApply(airplaneApplyAirplane);
+//        }
+//        for (String uavName : airplaneApply.getUavInfoName()) {
+//            EquInfoEntity equInfoEntity = new EquInfoEntity();
+//            equInfoEntity.setModelId(uavName);
+//            log.info("uavName的值==============:{}",uavName);
+////            List<EquInfoEntity> list = equInfoService.getEquInfoLists(equInfoEntity);
+//            List<EquInfoEntity> list = equInfoService.getEquInfos(equInfoEntity);
+//            log.info("list返回的值==============:{}",list);
+//            Long euqId = Long.valueOf(list.get(0).getEquId());
+//            AirplaneApplyAirplane airplaneApplyAirplane = new AirplaneApplyAirplane();
+//            airplaneApplyAirplane.setAirplaneApplyId(airplaneApply.getId());
+//            airplaneApplyAirplane.setAirplaneId(euqId);
+//            airplaneFlyMapper.insertAirplaneFlyApply(airplaneApplyAirplane);
+//        }
+        for (String equCode : airplaneApply.getAirUAV()) {
+            EquInfoEntity equInfoEntity = new EquInfoEntity();
+            equInfoEntity.setEquCode(equCode);
+            log.info("equCode的值==============:{}",equCode);
+//            List<EquInfoEntity> list = equInfoService.getEquInfoLists(equInfoEntity);
+            List<EquInfoEntity> list = equInfoService.getEquInfos(equInfoEntity);
+            log.info("list返回的值==============:{}",list);
+            if (list.size()>0){
+                Long euqId = Long.valueOf(list.get(0).getEquId());
+                AirplaneApplyAirplane airplaneApplyAirplane = new AirplaneApplyAirplane();
+                airplaneApplyAirplane.setAirplaneApplyId(airplaneApply.getId());
+                airplaneApplyAirplane.setAirplaneId(euqId);
+                airplaneFlyMapper.insertAirplaneFlyApply(airplaneApplyAirplane);
+            }
+
+        }
+
+        // 根据飞行申请新增该飞行申请的关联飞手主键
+//        for (UavOperator uavOperator : airplaneApply.getUavOperators()) {
+//            AirplaneApplyOperator airplaneApplyOperator = null;
+//            airplaneApplyOperator.setAirplaneApplyId(airplaneApply.getId());
+//            airplaneApplyOperator.setOperatorId(uavOperator.getId());
+//            airplaneOperatorMapper.insertAirplaneOperatorApply(airplaneApplyOperator);
+//        }
+        for (String uavOperatorName : airplaneApply.getUavOperatorName()) {
+            UavOperator uavOperator = new UavOperator();
+//            SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//            Long deptId = sysUser.getDeptId();
+            Long deptId = SecurityUtils.getDeptId();
+            uavOperator.setOrgId(deptId);
+            uavOperator.setUserName(uavOperatorName);
+            List<UavOperator> list = uavOperatorService.selectUavOperatorList(uavOperator);
+            AirplaneApplyOperator airplaneApplyOperator = new AirplaneApplyOperator();
+            airplaneApplyOperator.setAirplaneApplyId(airplaneApply.getId());
+            airplaneApplyOperator.setOperatorId(list.get(0).getId());
+            airplaneOperatorMapper.insertAirplaneOperatorApply(airplaneApplyOperator);
+        }
+        // 根据飞行申请新增该飞行申请的关联空域主键
+//        for (AirspaceApply airspaceApply : airplaneApply.getAirspaceApplies()) {
+//            AirplaneApplyAirspace airplaneApplyAirspace = null;
+//            airplaneApplyAirspace.setAirplaneApplyId(airplaneApply.getId());
+//            airplaneApplyAirspace.setAirspaceId(airspaceApply.getId());
+//            airspaceMapper.insertAirplaneAirspaceApply(airplaneApplyAirspace);
+//        }
+        for (String airspaceName : airplaneApply.getAirspaceName()) {
+            AirspaceApply airspaceApply = new AirspaceApply();
+//            SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//            airspaceApply.setCreateBy(sysUser.getUserName());
+            airspaceApply.setName(airspaceName);
+            List<AirspaceApply> list = airspaceService.selectAirspaceApplyList(airspaceApply);
+            AirplaneApplyAirspace airplaneApplyAirspace = new AirplaneApplyAirspace();
+            airplaneApplyAirspace.setAirplaneApplyId(airplaneApply.getId());
+            airplaneApplyAirspace.setAirspaceId(list.get(0).getId());
+            airspaceMapper.insertAirplaneAirspaceApply(airplaneApplyAirspace);
+        }
+        return airplaneMapper.updateAirplaneApply(airplaneApply);
+    }
+
+    /**
+     * 根据id删除
+     * @param id 空域申请主键
+     * @return
+     */
+    @Override
+    public int deleteAirplaneApplyById(Long id) {
+        return airplaneMapper.deleteAirplaneApplyById(id);
+    }
+
+    /**
+     * 根据id批量删除
+     * @param ids 需要删除的数据主键集合
+     * @return
+     */
+    @Override
+    public int deleteAirplaneApplyByIds(Long[] ids) {
+        for (Long id : ids) {
+            // 先删除原有的关联数据
+            airplaneFlyMapper.deleteAirplaneFlyApplyByFlyId(id);
+            airplaneOperatorMapper.deleteAirplaneApplyByOperatorId(id);
+            airspaceMapper.deleteAirplaneAirspaceApplyByAirspaceId(id);
+        }
+        return airplaneMapper.deleteAirplaneApplyByIds(ids);
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirspaceImpl.java b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirspaceImpl.java
new file mode 100644
index 0000000..0ff5105
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirspaceImpl.java
@@ -0,0 +1,67 @@
+package com.djhk.uav.airspace.service.impl;
+
+
+import com.djhk.uav.airspace.domain.AirspaceApply;
+import com.djhk.uav.airspace.domain.AirspaceWaypoint;
+import com.djhk.uav.airspace.mapper.AirspaceMapper;
+import com.djhk.uav.airspace.service.AirspaceService;
+import com.djhk.uav.airspace.service.AirspaceWaypointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class AirspaceImpl implements AirspaceService {
+
+    @Resource
+    private AirspaceMapper airspaceMapper;
+    @Autowired
+    private AirspaceWaypointService airspaceWaypointService;
+
+
+    @Override
+    public AirspaceApply selectAirspaceApplyById(Long id) {
+        return airspaceMapper.selectAirspaceApplyById(id);
+    }
+
+    @Override
+    public Long selectAirspaceApplyId() {
+        return airspaceMapper.selectAirspaceApplyId();
+    }
+
+
+    @Override
+    public List<AirspaceApply> selectAirspaceApplyList(AirspaceApply airspaceApply) {
+        List<AirspaceApply> airspaceApplys = new ArrayList<>();
+        List<AirspaceApply> airspaceApplyList = airspaceMapper.selectAirspaceApplyList(airspaceApply);
+        for (AirspaceApply apply : airspaceApplyList) {
+            List<AirspaceWaypoint> airspaceWaypoints = airspaceWaypointService.selectAirspaceWaypointList(apply.getId());
+            apply.setAirlineWaypointList(airspaceWaypoints);
+            airspaceApplys.add(apply);
+        }
+        return airspaceApplys;
+    }
+
+    @Override
+    public int insertAirspaceApply(AirspaceApply airspaceApply) {
+        return airspaceMapper.insertAirspaceApply(airspaceApply);
+    }
+
+    @Override
+    public int updateAirspaceApply(AirspaceApply airspaceApply) {
+        return airspaceMapper.updateAirspaceApply(airspaceApply);
+    }
+
+    @Override
+    public int deleteAirspaceApplyById(Long id) {
+        return airspaceMapper.deleteAirspaceApplyById(id);
+    }
+
+    @Override
+    public int deleteAirspaceApplyByIds(Long[] ids) {
+        return airspaceMapper.deleteAirspaceApplyByIds(ids);
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirspaceWaypointImpl.java b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirspaceWaypointImpl.java
new file mode 100644
index 0000000..1721ec8
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/airspace/service/impl/AirspaceWaypointImpl.java
@@ -0,0 +1,44 @@
+package com.djhk.uav.airspace.service.impl;
+
+
+import com.djhk.uav.airspace.domain.AirspaceWaypoint;
+import com.djhk.uav.airspace.mapper.AirspaceWaypointMapper;
+import com.djhk.uav.airspace.service.AirspaceWaypointService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class AirspaceWaypointImpl implements AirspaceWaypointService {
+
+    @Resource
+    private AirspaceWaypointMapper airspaceWaypointMapper;
+
+
+    @Override
+    public AirspaceWaypoint selectAirspaceWaypointById(Long id) {
+        return airspaceWaypointMapper.selectAirspaceWaypointById(id);
+    }
+
+    @Override
+    public List<AirspaceWaypoint> selectAirspaceWaypointList(Long airspaceApplyId) {
+        return airspaceWaypointMapper.selectAirspaceWaypointList(airspaceApplyId);
+    }
+
+    @Override
+    public int insertAirspaceWaypoint(AirspaceWaypoint AirspaceWaypoint) {
+        return airspaceWaypointMapper.insertAirspaceWaypoint(AirspaceWaypoint);
+    }
+
+
+    @Override
+    public int deleteAirspaceWaypointById(Long id) {
+        return airspaceWaypointMapper.deleteAirspaceWaypointById(id);
+    }
+
+    @Override
+    public int deleteAirspaceWaypointByIds(Long[] ids) {
+        return airspaceWaypointMapper.deleteAirspaceWaypointByIds(ids);
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquInfo.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquInfo.java
new file mode 100644
index 0000000..db2dc0b
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquInfo.java
@@ -0,0 +1,210 @@
+package com.djhk.uav.equ.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备台账对象 equ_info
+ * 
+ * @author huangqinguo
+ * @date 2023-06-01
+ */
+public class EquInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long equId;
+
+    /**  */
+    @Excel(name = "")
+    private String equCode;
+
+    /**  */
+    @Excel(name = "")
+    private String typeId;
+
+    /**  */
+    @Excel(name = "")
+    private Long modelId;
+
+    /** 0正常，1故障，2报废 */
+    @Excel(name = "0正常，1故障，2报废")
+    private String equSts;
+
+    /**  */
+    @Excel(name = "")
+    private String equSn;
+
+    /** 组织Id */
+    @Excel(name = "组织Id")
+    private Long organId;
+
+    /**  */
+    @Excel(name = "")
+    private String mngName;
+
+    /**  */
+    @Excel(name = "")
+    private String mngCode;
+
+    /**  */
+    @Excel(name = "")
+    private String purDate;
+
+    /**  */
+    @Excel(name = "")
+    private String mtnDate;
+
+    /**  */
+    @Excel(name = "")
+    private Long locLon;
+
+    /**  */
+    @Excel(name = "")
+    private Long locLat;
+
+    public void setEquId(Long equId) 
+    {
+        this.equId = equId;
+    }
+
+    public Long getEquId() 
+    {
+        return equId;
+    }
+    public void setEquCode(String equCode) 
+    {
+        this.equCode = equCode;
+    }
+
+    public String getEquCode() 
+    {
+        return equCode;
+    }
+    public void setTypeId(String typeId) 
+    {
+        this.typeId = typeId;
+    }
+
+    public String getTypeId() 
+    {
+        return typeId;
+    }
+    public void setModelId(Long modelId) 
+    {
+        this.modelId = modelId;
+    }
+
+    public Long getModelId() 
+    {
+        return modelId;
+    }
+    public void setEquSts(String equSts) 
+    {
+        this.equSts = equSts;
+    }
+
+    public String getEquSts() 
+    {
+        return equSts;
+    }
+    public void setEquSn(String equSn) 
+    {
+        this.equSn = equSn;
+    }
+
+    public String getEquSn() 
+    {
+        return equSn;
+    }
+    public void setOrganId(Long organId) 
+    {
+        this.organId = organId;
+    }
+
+    public Long getOrganId() 
+    {
+        return organId;
+    }
+    public void setMngName(String mngName) 
+    {
+        this.mngName = mngName;
+    }
+
+    public String getMngName() 
+    {
+        return mngName;
+    }
+    public void setMngCode(String mngCode) 
+    {
+        this.mngCode = mngCode;
+    }
+
+    public String getMngCode() 
+    {
+        return mngCode;
+    }
+    public void setPurDate(String purDate) 
+    {
+        this.purDate = purDate;
+    }
+
+    public String getPurDate() 
+    {
+        return purDate;
+    }
+    public void setMtnDate(String mtnDate) 
+    {
+        this.mtnDate = mtnDate;
+    }
+
+    public String getMtnDate() 
+    {
+        return mtnDate;
+    }
+    public void setLocLon(Long locLon) 
+    {
+        this.locLon = locLon;
+    }
+
+    public Long getLocLon() 
+    {
+        return locLon;
+    }
+    public void setLocLat(Long locLat) 
+    {
+        this.locLat = locLat;
+    }
+
+    public Long getLocLat() 
+    {
+        return locLat;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("equId", getEquId())
+            .append("equCode", getEquCode())
+            .append("typeId", getTypeId())
+            .append("modelId", getModelId())
+            .append("equSts", getEquSts())
+            .append("equSn", getEquSn())
+            .append("organId", getOrganId())
+            .append("mngName", getMngName())
+            .append("mngCode", getMngCode())
+            .append("purDate", getPurDate())
+            .append("mtnDate", getMtnDate())
+            .append("locLon", getLocLon())
+            .append("locLat", getLocLat())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquInfoEntity.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquInfoEntity.java
new file mode 100644
index 0000000..5183353
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquInfoEntity.java
@@ -0,0 +1,216 @@
+package com.djhk.uav.equ.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 设备台账
+ *
+ * @author gzm
+ * @since 1.0.0 2023-06-07
+ */
+
+@Data
+public class EquInfoEntity extends BaseEntity {
+	/**
+	* 设备标识
+	*/
+
+	private Integer equId;
+
+	/**
+	* 设备编号
+	*/
+	@Excel(name = "警航编号（自动生成填写无效）")
+	private String equCode;
+
+
+	/**
+	 * 所属机构
+	 */
+	@Excel(name = "所属机构")
+	private String deptName;
+
+	/**
+	 * 国标码
+	 */
+	@Excel(name = "国标码")
+	private String gbCode;
+
+	/**
+	* 类别标识
+	*/
+	@Excel(name = "类别标识（无人机、反制设备、其它设备）")
+	private String typeId;
+
+	/**
+	* 设备型号
+	*/
+	@Excel(name = "设备型号(设备型号-型号编码)")
+	private String modelId;
+
+	/**
+	* 设备状态
+	*/
+	@Excel(name = "设备状态：0正常，1故障，2报废")
+	private String equSts;
+
+	/**
+	* 设备序列号
+	*/
+	@Excel(name = "设备序列号")
+	private String equSn;
+
+	/**
+	* 机构标识
+	*/
+	private Long organId;
+
+	/**
+	* 责任人姓名
+	*/
+	@Excel(name = "责任人姓名")
+	private String mngName;
+
+	/**
+	* 责任人警号
+	*/
+	@Excel(name = "责任人警号")
+	private String mngCode;
+
+	/**
+	* 采购日期
+	*/
+	@Excel(name = "采购日期（格式：2024-05-22）")
+	private String purDate;
+
+	/**
+	* 保修期限
+	*/
+	@Excel(name = "保险期限（格式：2024-05-22）")
+	private String mtnDate;
+
+	/**
+	* 部署位置经度
+	*/
+	@Excel(name = "部署位置经度")
+	private Double locLon;
+
+	/**
+	* 部署位置纬度
+	*/
+	@Excel(name = "部署位置纬度")
+	private Double locLat;
+
+	/**
+	 * 任务荷载
+	 */
+	@Excel(name = "任务荷载")
+	private String equLoad;
+
+	/**
+	 * 设备分类
+	 */
+	@Excel(name = "设备分类：0报废微型，1轻型，2中型，3大型")
+	private String classify;
+
+	/**
+	 * 附件
+	 */
+	private String insuranceUrl;
+
+	/**
+	 * 保险状态
+	 */
+	private String insuranceSts;
+
+	/**
+	 * 归属权
+	 */
+	@Excel(name = "归属权：0是，1否")
+	private String attribution;
+
+	/**
+	 * 申请状态
+	 */
+	private String applySts;
+
+	/**
+	 * 刪除标志0存在2删除
+	 */
+	private String delFlag;
+
+	/**
+	* 创建人
+	*/
+	private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	private Date createTime;
+
+	/**
+	* 修改人
+	*/
+	private String updateBy;
+
+	/**
+	* 修改时间
+	*/
+	private Date updateTime;
+
+	private String tranSts;
+
+	private String typeName;
+
+	private String modelName;
+
+
+	private List<EquModelParam> modelParamList;
+
+
+	/**
+	 * 在线状态
+	 */
+	private String onlineSts;
+
+
+	/**
+	 * 是否是反制设备
+	 */
+	private String isCounter;
+
+	/**
+	 * 保险过期状态
+	 */
+	private Integer mtnDateState;
+
+	/**
+	 * 设备功能
+	 */
+	private String equFunction;
+
+	/**
+	 * 设备类型
+	 */
+	private String equType;
+
+	/**
+	 * 范围角度
+	 */
+	private String rangeRad;
+
+	/**
+	 * 是否具有特殊功能
+	 */
+	private String spacialFunction;
+
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquModel.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquModel.java
new file mode 100644
index 0000000..0cd9f25
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquModel.java
@@ -0,0 +1,193 @@
+package com.djhk.uav.equ.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+
+/**
+ * 设备型号对象 equ_model
+ * 
+ * @author huangqg
+ * @date 2023-06-01
+ */
+public class EquModel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 型号标识 */
+    private Long modelId;
+
+    /** 类别标识 */
+    @Excel(name = "类别标识")
+    private String typeId;
+
+    /** 型号编码 */
+    @Excel(name = "型号编码")
+    private String modelCode;
+
+    /** 型号名称 */
+    @Excel(name = "型号名称")
+    private String modelName;
+
+    /** 显示顺序 */
+    private Long showOrder;
+
+    /** 删除标志 */
+    private String delMark;
+
+    /** 静态模型 */
+//    @Excel(name = "静态模型")
+    private Long dynModelFile;
+
+    /** 动态模型 */
+//    @Excel(name = "动态模型")
+    private Long staModelFile;
+
+    /** 图标 */
+//    @Excel(name = "图标")
+    private Long iconFile;
+
+    private String staModelFilePath;
+
+    private String dynModelFilePath;
+
+    private String iconFilePath;
+
+    private String staModelFileName;
+
+    private String dynModelFileName;
+
+    private String iconFileName;
+
+
+
+    public void setModelId(Long modelId) 
+    {
+        this.modelId = modelId;
+    }
+
+    public Long getModelId() 
+    {
+        return modelId;
+    }
+    public void setTypeId(String typeId) 
+    {
+        this.typeId = typeId;
+    }
+
+    public String getTypeId() 
+    {
+        return typeId;
+    }
+    public void setModelCode(String modelCode) 
+    {
+        this.modelCode = modelCode;
+    }
+
+    public String getModelCode() 
+    {
+        return modelCode;
+    }
+    public void setModelName(String modelName) 
+    {
+        this.modelName = modelName;
+    }
+
+    public String getModelName() 
+    {
+        return modelName;
+    }
+    public void setShowOrder(Long showOrder) 
+    {
+        this.showOrder = showOrder;
+    }
+
+    public Long getShowOrder() 
+    {
+        return showOrder;
+    }
+    public void setDelMark(String delMark) 
+    {
+        this.delMark = delMark;
+    }
+
+    public String getDelMark() 
+    {
+        return delMark;
+    }
+    public void setDynModelFile(Long dynModelFile) 
+    {
+        this.dynModelFile = dynModelFile;
+    }
+
+    public Long getDynModelFile() 
+    {
+        return dynModelFile;
+    }
+    public void setStaModelFile(Long staModelFile) 
+    {
+        this.staModelFile = staModelFile;
+    }
+
+    public Long getStaModelFile() 
+    {
+        return staModelFile;
+    }
+    public void setIconFile(Long iconFile) 
+    {
+        this.iconFile = iconFile;
+    }
+
+    public Long getIconFile() 
+    {
+        return iconFile;
+    }
+
+    public String getStaModelFilePath() {
+        return staModelFilePath;
+    }
+
+    public void setStaModelFilePath(String staModelFilePath) {
+        this.staModelFilePath = staModelFilePath;
+    }
+
+    public String getDynModelFilePath() {
+        return dynModelFilePath;
+    }
+
+    public void setDynModelFilePath(String dynModelFilePath) {
+        this.dynModelFilePath = dynModelFilePath;
+    }
+
+    public String getIconFilePath() {
+        return iconFilePath;
+    }
+
+    public void setIconFilePath(String iconFilePath) {
+        this.iconFilePath = iconFilePath;
+    }
+
+    public String getStaModelFileName() {
+        return staModelFileName;
+    }
+
+    public void setStaModelFileName(String staModelFileName) {
+        this.staModelFileName = staModelFileName;
+    }
+
+    public String getDynModelFileName() {
+        return dynModelFileName;
+    }
+
+    public void setDynModelFileName(String dynModelFileName) {
+        this.dynModelFileName = dynModelFileName;
+    }
+
+    public String getIconFileName() {
+        return iconFileName;
+    }
+
+    public void setIconFileName(String iconFileName) {
+        this.iconFileName = iconFileName;
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquModelParam.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquModelParam.java
new file mode 100644
index 0000000..9ef75e3
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquModelParam.java
@@ -0,0 +1,119 @@
+package com.djhk.uav.equ.domain;
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 equ_model_param
+ * 
+ * @author ruoyi
+ * @date 2023-06-05
+ */
+public class EquModelParam extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long paramSeq;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long modelId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String paramCode;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String paramValue;
+
+    public void setParamSeq(Long paramSeq) 
+    {
+        this.paramSeq = paramSeq;
+    }
+
+    public Long getParamSeq() 
+    {
+        return paramSeq;
+    }
+    public void setModelId(Long modelId) 
+    {
+        this.modelId = modelId;
+    }
+
+    public Long getModelId() 
+    {
+        return modelId;
+    }
+    public void setParamCode(String paramCode) 
+    {
+        this.paramCode = paramCode;
+    }
+
+    public String getParamCode() 
+    {
+        return paramCode;
+    }
+    public void setParamValue(String paramValue) 
+    {
+        this.paramValue = paramValue;
+    }
+
+    public String getParamValue() 
+    {
+        return paramValue;
+    }
+
+    public String getParamName() {
+        return paramName;
+    }
+
+    public void setParamName(String paramName) {
+        this.paramName = paramName;
+    }
+
+    private String paramName;
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    private String dataType;
+
+    private Integer decCnt;
+
+    public Integer getDecCnt() {
+        return decCnt;
+    }
+
+    public void setDecCnt(Integer decCnt) {
+        this.decCnt = decCnt;
+    }
+
+    public Integer getMinVal() {
+        return minVal;
+    }
+
+    public void setMinVal(Integer minVal) {
+        this.minVal = minVal;
+    }
+
+    public Integer getMaxVal() {
+        return maxVal;
+    }
+
+    public void setMaxVal(Integer maxVal) {
+        this.maxVal = maxVal;
+    }
+
+    private Integer minVal;
+    private Integer maxVal;
+
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquParamDefine.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquParamDefine.java
new file mode 100644
index 0000000..27cee33
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquParamDefine.java
@@ -0,0 +1,123 @@
+package com.djhk.uav.equ.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】对象 equ_param_define
+ *
+ * @author ruoyi
+ * @date 2023-06-05
+ */
+public class EquParamDefine extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 参数编码 */
+    private String paramCode;
+
+    /** 参数名称 */
+    @Excel(name = "参数名称")
+    private String paramName;
+
+    /** 取值类型 */
+    @Excel(name = "取值类型")
+    private String dataType;
+
+    /** 小数位数 */
+    @Excel(name = "小数位数")
+    private Long decCnt;
+
+    /** 最小值 */
+    @Excel(name = "最小值")
+    private Long minVal;
+
+    /** 最大值 */
+    @Excel(name = "最大值")
+    private Long maxVal;
+
+    /** 启动标志 */
+    @Excel(name = "启动标志")
+    private String useFlag;
+
+    /** 显示顺序 */
+    @Excel(name = "显示顺序")
+    private Long showOrder;
+
+    public void setParamCode(String paramCode)
+    {
+        this.paramCode = paramCode;
+    }
+
+    public String getParamCode()
+    {
+        return paramCode;
+    }
+    public void setParamName(String paramName)
+    {
+        this.paramName = paramName;
+    }
+
+    public String getParamName()
+    {
+        return paramName;
+    }
+    public void setDataType(String dataType)
+    {
+        this.dataType = dataType;
+    }
+
+    public String getDataType()
+    {
+        return dataType;
+    }
+    public void setDecCnt(Long decCnt)
+    {
+        this.decCnt = decCnt;
+    }
+
+    public Long getDecCnt()
+    {
+        return decCnt;
+    }
+    public void setMinVal(Long minVal)
+    {
+        this.minVal = minVal;
+    }
+
+    public Long getMinVal()
+    {
+        return minVal;
+    }
+    public void setMaxVal(Long maxVal)
+    {
+        this.maxVal = maxVal;
+    }
+
+    public Long getMaxVal()
+    {
+        return maxVal;
+    }
+    public void setUseFlag(String useFlag)
+    {
+        this.useFlag = useFlag;
+    }
+
+    public String getUseFlag()
+    {
+        return useFlag;
+    }
+    public void setShowOrder(Long showOrder)
+    {
+        this.showOrder = showOrder;
+    }
+
+    public Long getShowOrder()
+    {
+        return showOrder;
+    }
+
+
+}
+
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquTranEntity.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquTranEntity.java
new file mode 100644
index 0000000..585643c
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquTranEntity.java
@@ -0,0 +1,88 @@
+package com.djhk.uav.equ.domain;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 设备转移
+ *
+ * @author gzm 
+ * @since 1.0.0 2023-06-09
+ */
+
+@Data
+public class EquTranEntity {
+	/**
+	* 流水号
+	*/
+	private Integer tranSeq;
+
+	/**
+	* 设备标识
+	*/
+	private Integer equId;
+
+	/**
+	* 发起机构
+	*/
+	private Long sendOrgan;
+
+	/**
+	* 接收机构
+	*/
+	private Long recvOrgan;
+
+	/**
+	* 转移状态
+	*/
+	private String tranSts;
+
+	/**
+	* 发起人
+	*/
+	private String sendBy;
+
+	/**
+	* 发起时间
+	*/
+	private Date sendTime;
+
+	/**
+	* 接收人
+	*/
+	private String recvBy;
+
+	/**
+	* 接收时间
+	*/
+	private Date recvTime;
+
+	/**
+	* 取消人
+	*/
+	private String cacelBy;
+
+	/**
+	* 取消时间
+	*/
+	private Date cancelTime;
+
+	/*
+	* 判断是否为接收人
+	* */
+	private String isRecvUser;
+
+	/*
+	 * 发起人姓名
+	 * */
+	private String sendUserName;
+
+	/*
+	 * 接收人姓名
+	 * */
+	private String recvUserName;
+
+
+}
\ No newline at end of file
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquType.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquType.java
new file mode 100644
index 0000000..73d6d3a
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquType.java
@@ -0,0 +1,123 @@
+package com.djhk.uav.equ.domain;
+
+import com.djhk.common.annotation.Excel;
+
+import com.djhk.common.core.domain.BaseEntity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设备类别对象 equ_type
+ * 
+ * @author huangqingguo
+ * @date 2023-06-02
+ */
+public class EquType extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 类别标识 */
+    private String typeId;
+
+    /** 类别名称 */
+    @Excel(name = "类别名称")
+    private String typeName;
+
+    /** 启用标志 */
+    @Excel(name = "启用标志")
+    private String useFlag;
+
+    /** 显示顺序 */
+    @Excel(name = "显示顺序")
+    private Long showOrder;
+
+    /** 动态模型 */
+    @Excel(name = "动态模型")
+    private Long dynModelFile;
+
+    /** 静态模型 */
+    @Excel(name = "静态模型")
+    private Long staModelFile;
+
+    /** 图标 */
+    @Excel(name = "图标")
+    private Long iconFile;
+
+    public void setTypeId(String typeId) 
+    {
+        this.typeId = typeId;
+    }
+
+    public String getTypeId() 
+    {
+        return typeId;
+    }
+    public void setTypeName(String typeName) 
+    {
+        this.typeName = typeName;
+    }
+
+    public String getTypeName() 
+    {
+        return typeName;
+    }
+    public void setUseFlag(String useFlag) 
+    {
+        this.useFlag = useFlag;
+    }
+
+    public String getUseFlag() 
+    {
+        return useFlag;
+    }
+    public void setShowOrder(Long showOrder) 
+    {
+        this.showOrder = showOrder;
+    }
+
+    public Long getShowOrder() 
+    {
+        return showOrder;
+    }
+    public void setDynModelFile(Long dynModelFile) 
+    {
+        this.dynModelFile = dynModelFile;
+    }
+
+    public Long getDynModelFile() 
+    {
+        return dynModelFile;
+    }
+    public void setStaModelFile(Long staModelFile) 
+    {
+        this.staModelFile = staModelFile;
+    }
+
+    public Long getStaModelFile() 
+    {
+        return staModelFile;
+    }
+    public void setIconFile(Long iconFile) 
+    {
+        this.iconFile = iconFile;
+    }
+
+    public Long getIconFile() 
+    {
+        return iconFile;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("typeId", getTypeId())
+            .append("typeName", getTypeName())
+            .append("useFlag", getUseFlag())
+            .append("showOrder", getShowOrder())
+            .append("dynModelFile", getDynModelFile())
+            .append("staModelFile", getStaModelFile())
+            .append("iconFile", getIconFile())
+            .toString();
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquTypeParam.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquTypeParam.java
new file mode 100644
index 0000000..cc18bfe
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/EquTypeParam.java
@@ -0,0 +1,57 @@
+package com.djhk.uav.equ.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+
+/**
+ * 待整理，用于说明某类设备包含哪些参数对象 equ_type_param
+ * 
+ * @author ruoyi
+ * @date 2023-06-05
+ */
+public class EquTypeParam extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long etpSeq;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String typeId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String paramCode;
+
+    public void setEtpSeq(Long etpSeq) 
+    {
+        this.etpSeq = etpSeq;
+    }
+
+    public Long getEtpSeq() 
+    {
+        return etpSeq;
+    }
+    public void setTypeId(String typeId) 
+    {
+        this.typeId = typeId;
+    }
+
+    public String getTypeId() 
+    {
+        return typeId;
+    }
+    public void setParamCode(String paramCode) 
+    {
+        this.paramCode = paramCode;
+    }
+
+    public String getParamCode() 
+    {
+        return paramCode;
+    }
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/Metasploitable.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/Metasploitable.java
new file mode 100644
index 0000000..753e1fe
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/Metasploitable.java
@@ -0,0 +1,88 @@
+package com.djhk.uav.equ.domain;
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 设备型号对象 uav_metasploitable
+ * 
+ * @author zhulongchuan
+ * @date 2024-11-013
+ */
+@Data
+public class Metasploitable extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 靶机标识 */
+    private Long id;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String brand;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String uavName;
+
+    /** 结构布局 */
+    @Excel(name = "结构布局")
+    private String structure;
+
+    /** 产品定位 */
+    @Excel(name = "产品定位")
+    private String product;
+
+    /** 能源*/
+    @Excel(name = "能源")
+    private String energy;
+
+    /** 尺寸 */
+    @Excel(name = "尺寸")
+    private String size;
+
+    /** 应用 */
+    @Excel(name = "应用")
+    private String useType;
+
+    /** 图传类型 */
+    @Excel(name = "图传类型")
+    private String photoType;
+
+    /** 通信链路 */
+    @Excel(name = "通信链路")
+    private String infoLinks;
+
+    /** 定位系统 */
+    @Excel(name = "定位系统")
+    private String positionSys;
+
+    /** 产品介绍 */
+    @Excel(name = "产品介绍")
+    private String productPre;
+
+    /** 图片 */
+//    @Excel(name = "图片")
+    private Long photo;
+
+
+    /** 图片名字 */
+//    @Excel(name = "图片")
+    private String photoFileName;
+
+
+    /** 图片路径 */
+//    @Excel(name = "图片")
+    private String photoFilePath;
+
+    /** 价格 */
+    @Excel(name = "价格")
+    private String price;
+
+    /** 重量 */
+    @Excel(name = "重量")
+    private String weight;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/SysMenus.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/SysMenus.java
new file mode 100644
index 0000000..71e07bd
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/SysMenus.java
@@ -0,0 +1,260 @@
+package com.djhk.uav.equ.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import com.djhk.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 菜单权限表 sys_menu
+ * 
+ * @author myk
+ */
+public class SysMenus extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 菜单ID */
+    private Long menuId;
+
+    /** 菜单名称 */
+    private String menuName;
+
+    /** 父菜单名称 */
+    private String parentName;
+
+    /** 父菜单ID */
+    private Long parentId;
+
+    /** 显示顺序 */
+    private Integer orderNum;
+
+    /** 路由地址 */
+    private String path;
+
+    /** 组件路径 */
+    private String component;
+
+    /** 路由参数 */
+    private String query;
+
+    /** 是否为外链（0是 1否） */
+    private String isFrame;
+
+    /** 是否缓存（0缓存 1不缓存） */
+    private String isCache;
+
+    /** 类型（M目录 C菜单 F按钮） */
+    private String menuType;
+
+    /** 显示状态（0显示 1隐藏） */
+    private String visible;
+    
+    /** 菜单状态（0显示 1隐藏） */
+    private String status;
+
+    /** 权限字符串 */
+    private String perms;
+
+    /** 菜单图标 */
+    private String icon;
+
+    /** 子菜单 */
+    private List<SysMenus> children = new ArrayList<SysMenus>();
+
+    public Long getMenuId()
+    {
+        return menuId;
+    }
+
+    public void setMenuId(Long menuId)
+    {
+        this.menuId = menuId;
+    }
+
+    @NotBlank(message = "菜单名称不能为空")
+    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
+    public String getMenuName()
+    {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName)
+    {
+        this.menuName = menuName;
+    }
+
+    public String getParentName()
+    {
+        return parentName;
+    }
+
+    public void setParentName(String parentName)
+    {
+        this.parentName = parentName;
+    }
+
+    public Long getParentId()
+    {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getOrderNum()
+    {
+        return orderNum;
+    }
+
+    public void setOrderNum(Integer orderNum)
+    {
+        this.orderNum = orderNum;
+    }
+
+    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
+    public String getPath()
+    {
+        return path;
+    }
+
+    public void setPath(String path)
+    {
+        this.path = path;
+    }
+
+    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
+    public String getComponent()
+    {
+        return component;
+    }
+
+    public void setComponent(String component)
+    {
+        this.component = component;
+    }
+
+    public String getQuery()
+    {
+        return query;
+    }
+
+    public void setQuery(String query)
+    {
+        this.query = query;
+    }
+
+    public String getIsFrame()
+    {
+        return isFrame;
+    }
+
+    public void setIsFrame(String isFrame)
+    {
+        this.isFrame = isFrame;
+    }
+
+    public String getIsCache()
+    {
+        return isCache;
+    }
+
+    public void setIsCache(String isCache)
+    {
+        this.isCache = isCache;
+    }
+
+    @NotBlank(message = "菜单类型不能为空")
+    public String getMenuType()
+    {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType)
+    {
+        this.menuType = menuType;
+    }
+
+    public String getVisible()
+    {
+        return visible;
+    }
+
+    public void setVisible(String visible)
+    {
+        this.visible = visible;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
+    public String getPerms()
+    {
+        return perms;
+    }
+
+    public void setPerms(String perms)
+    {
+        this.perms = perms;
+    }
+
+    public String getIcon()
+    {
+        return icon;
+    }
+
+    public void setIcon(String icon)
+    {
+        this.icon = icon;
+    }
+
+    public List<SysMenus> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<SysMenus> children)
+    {
+        this.children = children;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("menuId", getMenuId())
+            .append("menuName", getMenuName())
+            .append("parentId", getParentId())
+            .append("orderNum", getOrderNum())
+            .append("path", getPath())
+            .append("component", getComponent())
+            .append("isFrame", getIsFrame())
+            .append("IsCache", getIsCache())
+            .append("menuType", getMenuType())
+            .append("visible", getVisible())
+            .append("status ", getStatus())
+            .append("perms", getPerms())
+            .append("icon", getIcon())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/dto/EquInfoExportDto.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/dto/EquInfoExportDto.java
new file mode 100644
index 0000000..29a0c24
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/dto/EquInfoExportDto.java
@@ -0,0 +1,91 @@
+package com.djhk.uav.equ.domain.dto;
+
+import com.djhk.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EquInfoExportDto implements Serializable {
+
+//    @TableId
+//    private Integer equId;
+
+    /**
+     * 设备编号
+     */
+    @Excel(name = "警航编号（自动生成填写无效）")
+    private String equCode;
+
+    /**
+     * 类别标识
+     */
+    @Excel(name = "类别标识（无人机、反制设备、其它设备）")
+    private String typeId;
+
+    /**
+     * 设备型号
+     */
+    @Excel(name = "设备型号(设备型号-型号编码)")
+    private String modelId;
+//    private Integer modelId;
+
+    @Excel(name = "国标码")
+    private String gbCode;
+    /**
+     * 设备状态
+     */
+    @Excel(name = "设备状态：0正常，1故障，2报废")
+    private String equSts;
+
+    /**
+     * 设备序列号
+     */
+    @Excel(name = "设备序列号")
+    private String equSn;
+
+    /**
+     * 机构标识
+     */
+    @Excel(name = "机构标识")
+    private String  organId;
+//    private Long organId;
+
+    /**
+     * 责任人姓名
+     */
+    @Excel(name = "责任人姓名")
+    private String mngName;
+
+    /**
+     * 责任人警号
+     */
+    @Excel(name = "责任人警号")
+    private String mngCode;
+
+    /**
+     * 采购日期
+     */
+    @Excel(name = "采购日期（格式：2024-05-22）")
+    private String purDate;
+
+    /**
+     * 保修期限
+     */
+    @Excel(name = "保险期限（格式：2024-05-22）")
+    private String mtnDate;
+
+    /**
+     * 部署位置经度
+     */
+    @Excel(name = "部署位置经度")
+    private Double locLon;
+
+    /**
+     * 部署位置纬度
+     */
+    @Excel(name = "部署位置纬度")
+    private Double locLat;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/dto/EquModelExportDto.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/dto/EquModelExportDto.java
new file mode 100644
index 0000000..5b56709
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/dto/EquModelExportDto.java
@@ -0,0 +1,89 @@
+package com.djhk.uav.equ.domain.dto;
+
+import com.djhk.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EquModelExportDto implements Serializable {
+
+//    @TableId
+//    private Integer equId;
+
+    /**
+     * 设备编号
+     */
+    @Excel(name = "设备编号")
+    private String equCode;
+
+    /**
+     * 类别标识
+     */
+    @Excel(name = "类别标识")
+    private String typeId;
+
+    /**
+     * 设备型号
+     */
+    @Excel(name = "设备型号(设备型号-型号编码)")
+    private Integer modelId;
+//    private Integer modelId;
+
+    /**
+     * 设备状态
+     */
+    @Excel(name = "设备状态：0正常，1故障，2报废")
+    private String equSts;
+
+    /**
+     * 设备序列号
+     */
+    @Excel(name = "设备序列号")
+    private String equSn;
+
+    /**
+     * 机构标识
+     */
+    @Excel(name = "机构标识")
+    private String  organId;
+//    private Long organId;
+
+    /**
+     * 责任人姓名
+     */
+    @Excel(name = "责任人姓名")
+    private String mngName;
+
+    /**
+     * 责任人警号
+     */
+    @Excel(name = "责任人警号")
+    private String mngCode;
+
+    /**
+     * 采购日期
+     */
+    @Excel(name = "采购日期")
+    private String purDate;
+
+    /**
+     * 保修期限
+     */
+    @Excel(name = "保修期限")
+    private String mtnDate;
+
+    /**
+     * 部署位置经度
+     */
+    @Excel(name = "部署位置经度")
+    private Double locLon;
+
+    /**
+     * 部署位置纬度
+     */
+    @Excel(name = "部署位置纬度")
+    private Double locLat;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/EquInfoExportVo.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/EquInfoExportVo.java
new file mode 100644
index 0000000..0e85382
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/EquInfoExportVo.java
@@ -0,0 +1,22 @@
+package com.djhk.uav.equ.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class EquInfoExportVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private List<Integer> ids;
+
+    private List<Long> orgIds;
+    private Long  deptId;
+
+    private String createBy;
+    private String typeId;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/EquModelExportVo.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/EquModelExportVo.java
new file mode 100644
index 0000000..916e6f2
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/EquModelExportVo.java
@@ -0,0 +1,21 @@
+package com.djhk.uav.equ.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class EquModelExportVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private List<Integer> ids;
+
+    private List<Long> orgIds;
+
+    private String createBy;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/TreeSelects.java b/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/TreeSelects.java
new file mode 100644
index 0000000..91e7dc1
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/domain/vo/TreeSelects.java
@@ -0,0 +1,78 @@
+package com.djhk.uav.equ.domain.vo;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.djhk.common.core.domain.entity.SysDept;
+import com.djhk.uav.equ.domain.SysMenus;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * Treeselect树结构实体类
+ * 
+ * @author myk
+ */
+public class TreeSelects implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelects> children;
+
+    public TreeSelects()
+    {
+
+    }
+
+    public TreeSelects(SysDept dept)
+    {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.children = dept.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList());
+    }
+
+    public TreeSelects(SysMenus menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelects::new).collect(Collectors.toList());
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public String getLabel()
+    {
+        return label;
+    }
+
+    public void setLabel(String label)
+    {
+        this.label = label;
+    }
+
+    public List<TreeSelects> getChildren()
+    {
+        return children;
+    }
+
+    public void setChildren(List<TreeSelects> children)
+    {
+        this.children = children;
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/service/EquInfoService.java b/djhk-system/src/main/java/com/djhk/uav/equ/service/EquInfoService.java
new file mode 100644
index 0000000..5680532
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/service/EquInfoService.java
@@ -0,0 +1,60 @@
+package com.djhk.uav.equ.service;
+
+
+
+
+import com.djhk.common.core.domain.entity.SysDept;
+import com.djhk.common.exception.ServiceException;
+import com.djhk.uav.equ.domain.EquInfoEntity;
+import com.djhk.uav.equ.domain.EquTranEntity;
+import com.djhk.uav.equ.domain.dto.EquInfoExportDto;
+import com.djhk.uav.equ.domain.vo.EquInfoExportVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备台账
+ *
+ * @author gzm
+ * @since 1.0.0 2023-06-07
+ */
+public interface EquInfoService {
+
+    List<EquInfoEntity> getEquInfoList(EquInfoEntity query);
+
+    List<EquInfoEntity> getEquInfoLists(EquInfoEntity query);
+
+    List<EquInfoEntity> getEquInfos(EquInfoEntity query);
+
+    public EquInfoEntity selectEquInfoById(String equId);
+
+    int saves(EquInfoEntity vo);
+
+    int update(EquInfoEntity vo);
+
+    int delete(String[] equIds);
+
+    int updateEquInfoByIds(String[] equIds);
+
+    List<EquTranEntity> getEquTranList(EquTranEntity query);
+
+    int saveTran(EquTranEntity vo);
+
+    List<EquTranEntity> getTranStsByEquId(String equId);
+
+    int reciveTranMethod(Map vo);
+
+    List<Object> getTjTree();
+
+    List<Object> getTjTreeForDept(SysDept dept);
+
+    List<EquInfoEntity> selectMonitorEquList(String[] typeIds);
+
+    EquInfoEntity selectEquInfoByEquSn(EquInfoEntity vo);
+
+    List<EquInfoExportDto> selectEquInfoExportList(EquInfoExportVo equInfoExportVo);
+
+
+    String importData(List<EquInfoExportDto> userList, Boolean isUpdateSupport) throws ServiceException;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java
new file mode 100644
index 0000000..67583d9
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquInfoServiceImpl.java
@@ -0,0 +1,122 @@
+package com.djhk.uav.equ.service.impl;
+
+
+import com.djhk.common.core.domain.R;
+import com.djhk.common.core.domain.entity.SysDept;
+import com.djhk.common.exception.ServiceException;
+import com.djhk.uav.equ.domain.EquInfoEntity;
+import com.djhk.uav.equ.domain.EquTranEntity;
+import com.djhk.uav.equ.domain.dto.EquInfoExportDto;
+import com.djhk.uav.equ.domain.vo.EquInfoExportVo;
+import com.djhk.uav.equ.service.EquInfoService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 设备台账
+ *
+ * @author gzm
+ * @since 1.0.0 2023-06-07
+ */
+@Service
+public class EquInfoServiceImpl implements EquInfoService {
+
+
+    @Override
+    public List<EquInfoEntity> getEquInfoList(EquInfoEntity query) {
+        return null;
+    }
+
+    @Override
+    public List<EquInfoEntity> getEquInfoLists(EquInfoEntity query) {
+        return null;
+    }
+
+    @Override
+    public List<EquInfoEntity> getEquInfos(EquInfoEntity query) {
+        return null;
+    }
+
+    @Override
+    public EquInfoEntity selectEquInfoById(String equId) {
+        return null;
+    }
+
+    @Override
+    public int saves(EquInfoEntity vo) {
+        return 0;
+    }
+
+    @Override
+    public int update(EquInfoEntity vo) {
+        return 0;
+    }
+
+    @Override
+    public int delete(String[] equIds) {
+        return 0;
+    }
+
+    @Override
+    public int updateEquInfoByIds(String[] equIds) {
+        return 0;
+    }
+
+    @Override
+    public List<EquTranEntity> getEquTranList(EquTranEntity query) {
+        return null;
+    }
+
+    @Override
+    public int saveTran(EquTranEntity vo) {
+        return 0;
+    }
+
+    @Override
+    public List<EquTranEntity> getTranStsByEquId(String equId) {
+        return null;
+    }
+
+    @Override
+    public int reciveTranMethod(Map vo) {
+        return 0;
+    }
+
+    @Override
+    public List<Object> getTjTree() {
+        return null;
+    }
+
+    @Override
+    public List<Object> getTjTreeForDept(SysDept dept) {
+        return null;
+    }
+
+    @Override
+    public List<EquInfoEntity> selectMonitorEquList(String[] typeIds) {
+        return null;
+    }
+
+    @Override
+    public EquInfoEntity selectEquInfoByEquSn(EquInfoEntity vo) {
+        return null;
+    }
+
+    @Override
+    public List<EquInfoExportDto> selectEquInfoExportList(EquInfoExportVo equInfoExportVo) {
+        return null;
+    }
+
+    @Override
+    public String importData(List<EquInfoExportDto> userList, Boolean isUpdateSupport) throws ServiceException {
+        return null;
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/controller/LabelController - 副本.java.txt b/djhk-system/src/main/java/com/djhk/uav/label/controller/LabelController - 副本.java.txt
new file mode 100644
index 0000000..d9ea725
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/controller/LabelController - 副本.java.txt	
@@ -0,0 +1,264 @@
+package com.djhk.uav.label.controller;
+
+import com.djhk.common.core.domain.R;
+import com.djhk.common.core.web.controller.BaseController;
+import com.djhk.common.core.web.page.TableDataInfo;
+import com.djhk.space.flight.label.domain.CatalogueDto;
+import com.djhk.space.flight.label.domain.Plotting;
+import com.djhk.space.flight.label.domain.PlottingQuery;
+import com.djhk.space.flight.label.service.LabelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author jwh
+ * @version 1.0
+ * @description
+ * @date 2023/7/26 11:03:55
+ */
+@RestController
+@RequestMapping("/plot")
+public class LabelController extends BaseController {
+
+    @Autowired
+    private LabelService labelService;
+
+
+    /**
+     * 导出kml文件
+     *
+     *
+     * @return
+     */
+    @GetMapping(value = "/downloadPlot")
+    public R listCatalogue(@RequestParam List folderIds) {
+        return labelService.downloadPlot(folderIds);
+    }
+
+    @PostMapping("/importPlot")
+    public R uploadFile(@RequestParam("file") MultipartFile file){
+        return labelService.uploadPlot(file);
+    }
+
+    /**
+     * 添加标注目录
+     *
+     * @param catalogueDto
+     * @return
+     */
+    @PostMapping("/addDir")
+    public R addCatalogue(@RequestBody CatalogueDto catalogueDto) {
+        return labelService.addCatalogue(catalogueDto);
+    }
+
+    /**
+     * 删除目录
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping("/{ids}")
+    public R delete(@PathVariable Integer[] ids) {
+        return labelService.deleteCatalogue(ids);
+    }
+
+    /**
+     * 修改目录名称
+     *
+     * @param catalogueDto
+     * @return
+     */
+    @PostMapping("/updateDir")
+    public R updateCatalogue(@RequestBody CatalogueDto catalogueDto) {
+        return labelService.updateCatalogue(catalogueDto);
+    }
+
+    /**
+     * 查询目录列表--不分页
+     *
+     * @param catalogueDto
+     * @return
+     */
+    @GetMapping("/listdir")
+    public R listCatalogue(CatalogueDto catalogueDto) {
+        return labelService.listCatalogue(catalogueDto);
+    }
+
+    /**
+     * 修改目录锁定状态
+     *
+     * @param id
+     * @param lockStatus
+     */
+    @GetMapping("/changeLockStatusDir")
+    public R changeLockStatus(@RequestParam("id") Integer id, @RequestParam("lockStatus") Integer lockStatus) {
+        return labelService.changeLockStatusCatalogue(id, lockStatus);
+    }
+
+    /**
+     * 修改目录显示/隐藏状态
+     *
+     * @param id
+     * @param showStatus
+     * @return
+     */
+    @GetMapping("/changeShowStatusDir")
+    public R changeShowStatus(@RequestParam("id") Integer id, @RequestParam("showStatus") Integer showStatus) {
+        return labelService.changeShowStatusCatalogue(id, showStatus);
+    }
+
+    /**
+     * 修改目录分享状态
+     *
+     * @param id
+     * @param shareStatus
+     * @return
+     */
+    @GetMapping("/changeShareStatusDir")
+    public R changeShareStatus(@RequestParam("id") Integer id, @RequestParam("shareStatus") Integer shareStatus) {
+        return labelService.changeShareStatusCatalogue(id, shareStatus);
+    }
+
+
+    /**
+     * 添加标注目录
+     *
+     * @param catalogueDto
+     * @return
+     */
+    @PostMapping("/addPlotWeb")
+    public R addPlot(@RequestBody CatalogueDto catalogueDto) {
+        return labelService.addPlotWeb(catalogueDto);
+    }
+
+    /**
+     * 删除目录
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping("/deletePlot/{ids}")
+    public R deletePlot(@PathVariable Integer[] ids) {
+        return labelService.deletePlot(ids);
+    }
+
+    /**
+     * 删除目录下的所有标绘
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping("/deleteDirInner/{ids}")
+    public R deleteDirInner(@PathVariable Integer[] ids) {
+        return labelService.deleteDirInner(ids);
+    }
+
+    /**
+     * 修改目录名称
+     *
+     * @param catalogueDto
+     * @return
+     */
+    @PostMapping("/updatePlot")
+    public R updatePlot(@RequestBody CatalogueDto catalogueDto) {
+        return labelService.updatePlot(catalogueDto);
+    }
+    /**
+     * 修改标绘数据ByUUID
+     *
+     * @param catalogueDto
+     * @return
+     */
+    @PostMapping("/updatePlotByUUID")
+    public R updatePlotByUUID(@RequestBody Map<String,Object> catalogueDto) {
+        return labelService.updatePlotByUUID(catalogueDto);
+    }
+
+    @PostMapping("/updateOrder")
+    public R updateOrder(@RequestBody List<HashMap<String,Object>> list){
+        R result = labelService.updateOrder(list);
+        return result;
+    }
+
+    /**
+     * 查询目录列表--不分页
+     *
+     * @param folderId
+     * @return
+     */
+    @GetMapping("/listPlot")
+    public TableDataInfo listPlot(@RequestParam(required = false) Integer folderId,@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
+        return labelService.listPlot(folderId,pageNum,pageSize);
+    }
+    /**
+     * 查询标绘列表
+     *
+     * @return
+     */
+    @GetMapping("/plottings")
+    public R plottings() {
+        return labelService.listAllPlot();
+    }
+
+    /**
+     * 修改标绘锁定状态
+     *
+     * @param id
+     * @param lockStatus
+     */
+    @GetMapping("/changeLockStatusPlot")
+    public R changeLockStatusPlot(@RequestParam("id") Integer id, @RequestParam("lockStatus") Integer lockStatus) {
+        return labelService.changeLockStatusPlot(id, lockStatus);
+    }
+
+    /**
+     * 修改标绘显示/隐藏状态
+     *
+     * @param id
+     * @param showStatus
+     * @return
+     */
+    @GetMapping("/changeShowStatusPlot")
+    public R changeShowStatusPlot(@RequestParam("id") Integer id, @RequestParam("showStatus") Integer showStatus) {
+        return labelService.changeShowStatusPlot(id, showStatus);
+    }
+
+    /**
+     * 修改标绘分享状态
+     *
+     * @param id
+     * @param shareStatus
+     * @return
+     */
+    @GetMapping("/changeShareStatusPlot")
+    public R changeShareStatusPlot(@RequestParam("id") Integer id, @RequestParam("shareStatus") Integer shareStatus) {
+        return labelService.changeShareStatusPlot(id, shareStatus);
+    }
+
+    @GetMapping("/collection")
+    public R plotCollection(@RequestParam Map<String,Object> params) {
+        return labelService.plotCollection(params);
+    }
+
+    @GetMapping("/infoByUuid")
+    public R<Plotting> infoByUuid(@RequestParam("uuid") String uuid) {
+        return labelService.infoByUuid(uuid);
+    }
+
+    @GetMapping("/deleteByUuid")
+    public R deleteByUuid(@RequestParam("uuid") String uuid) {
+        return labelService.deleteByUuid(uuid);
+    }
+
+    @GetMapping("/count")
+    public R count(PlottingQuery query) {
+        return labelService.count(query);
+    }
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/controller/LabelController.java b/djhk-system/src/main/java/com/djhk/uav/label/controller/LabelController.java
new file mode 100644
index 0000000..90ccda2
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/controller/LabelController.java
@@ -0,0 +1,320 @@
+package com.djhk.uav.label.controller;
+
+
+import com.djhk.common.core.controller.BaseController;
+import com.djhk.common.core.domain.R;
+import com.djhk.common.core.page.TableDataInfo;
+import com.djhk.common.utils.DateUtils;
+import com.djhk.common.utils.SecurityUtils;
+import com.djhk.system.service.ISysUserService;
+import com.djhk.uav.label.domain.CatalogueDto;
+import com.djhk.uav.label.domain.FolderInfo;
+import com.djhk.uav.label.domain.Plotting;
+import com.djhk.uav.label.domain.PlottingQuery;
+import com.djhk.uav.label.service.LabelService;
+import com.djhk.uav.label.service.impl.AppFolderInfoServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author jwh
+ * @version 1.0
+ * @description
+ * @date 2023/7/26 11:03:55
+ */
+@RestController
+@RequestMapping("/plot")
+public class LabelController extends BaseController {
+
+    @Autowired
+    private LabelService labelService;
+    @Autowired
+    private AppFolderInfoServiceImpl appFolderInfoService;
+//    @Resource
+//    private RemoteUserService userService;
+    @Autowired
+    private ISysUserService userService;
+
+
+    /**
+     * 导出kml文件
+     *
+     *
+     * @return
+     */
+    @GetMapping(value = "/downloadPlot")
+    public R listCatalogue(@RequestParam List folderIds) {
+        return labelService.downloadPlot(folderIds);
+    }
+
+    @PostMapping("/importPlot")
+    public R uploadFile(@RequestParam("file") MultipartFile file){
+        return labelService.uploadPlot(file);
+    }
+
+    /**
+     * 添加标注目录
+     *
+     * @param folderInfo
+     * @return
+     */
+    @PostMapping("/addDir")
+    public R addCatalogue(@RequestBody FolderInfo folderInfo) {
+        //web端目录
+        folderInfo.setSource(1);
+        folderInfo.setInit(0);
+        int i = appFolderInfoService.insertFolderInfo(folderInfo);
+        if (i > 0) {
+            return R.ok(folderInfo.getId());
+        }
+        return R.fail("新增失败");
+//        return labelService.addCatalogue(catalogueDto);
+    }
+
+    /**
+     * 删除目录
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping("/{ids}")
+    public R delete(@PathVariable Integer[] ids) {
+        return labelService.deleteCatalogue(ids);
+    }
+
+    /**
+     * 修改目录名称
+     *
+     * @param folderInfo
+     * @return
+     */
+    @PostMapping("/updateDir")
+    public R updateCatalogue(@RequestBody FolderInfo folderInfo) {
+
+        //web端目录
+        folderInfo.setSource(1);
+        folderInfo.setInit(0);
+        return appFolderInfoService.updateFolderInfo(folderInfo);
+//        return labelService.updateCatalogue(catalogueDto);
+    }
+
+    /**
+     * 查询目录列表--不分页
+     *
+     * @param folderInfo
+     * @return
+     */
+    @GetMapping("/listdir")
+    public R listCatalogue(FolderInfo folderInfo) {
+        List<FolderInfo> list = new ArrayList<>();
+//        if (
+//                StringUtils.isNotEmpty(folderInfo.getAppId())
+//                        && folderInfo.getOrgId() != null
+//        ){
+//            startPage();
+//            list = appFolderInfoService.selectFolderInfoList(folderInfo);
+//        }
+        startPage();
+        list = appFolderInfoService.selectFolderInfoList(folderInfo);
+        return R.ok(list);
+    }
+
+    /**
+     * 修改目录锁定状态
+     *
+     * @param id
+     * @param lockStatus
+     */
+    @GetMapping("/changeLockStatusDir")
+    public R changeLockStatus(@RequestParam("id") Integer id, @RequestParam("lockStatus") Integer lockStatus) {
+        return labelService.changeLockStatusCatalogue(id, lockStatus);
+    }
+
+    /**
+     * 修改目录显示/隐藏状态
+     *
+     * @param id
+     * @param showStatus
+     * @return
+     */
+    @GetMapping("/changeShowStatusDir")
+    public R changeShowStatus(@RequestParam("id") Integer id, @RequestParam("showStatus") Integer showStatus) {
+        return labelService.changeShowStatusCatalogue(id, showStatus);
+    }
+
+    /**
+     * 修改目录分享状态
+     *
+     * @param id
+     * @param shareStatus
+     * @return
+     */
+    @GetMapping("/changeShareStatusDir")
+    public R changeShareStatus(@RequestParam("id") Integer id, @RequestParam("shareStatus") Integer shareStatus) {
+        return labelService.changeShareStatusCatalogue(id, shareStatus);
+    }
+
+
+    /**
+     * 添加标注目录
+     *
+     * @param plotting
+     * @return
+     */
+    @PostMapping("/addPlotWeb")
+    public R addPlot(@RequestBody Plotting plotting) {
+//        SysUser sysUser = userService.getUserInfoByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER).getData();
+//        plotting.setOrgId(sysUser.getDeptId());
+//        plotting.setCreateBy(sysUser.getUserName());
+        plotting.setOrgId(SecurityUtils.getDeptId());
+        plotting.setCreateBy(SecurityUtils.getUsername());
+        plotting.setCreateTime(DateUtils.getNowDate());
+        plotting.setDataType("GeoJSON");
+        plotting.setOrder(0);
+        plotting.setDelFlag("0");
+        return labelService.addPlotWeb(plotting);
+    }
+
+    /**
+     * 添加标注目录
+     *
+     * @param uuid
+     * @return
+     */
+    @GetMapping("/selectPlotByUuid/{uuid}")
+    public R selectPlotByUuid(@PathVariable String uuid) {
+        return labelService.selectPlotByUuid(uuid);
+    }
+
+
+    /**
+     * 删除目录
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping("/deletePlot/{ids}")
+    public R deletePlot(@PathVariable Integer[] ids) {
+        return labelService.deletePlot(ids);
+    }
+
+    /**
+     * 删除目录下的所有标绘
+     *
+     * @param ids
+     * @return
+     */
+    @GetMapping("/deleteDirInner/{ids}")
+    public R deleteDirInner(@PathVariable Integer[] ids) {
+        return labelService.deleteDirInner(ids);
+    }
+
+    /**
+     * 修改目录名称
+     *
+     * @param catalogueDto
+     * @return
+     */
+    @PostMapping("/updatePlot")
+    public R updatePlot(@RequestBody CatalogueDto catalogueDto) {
+        return labelService.updatePlot(catalogueDto);
+    }
+    /**
+     * 修改标绘数据ByUUID
+     *
+     * @param plotting
+     * @return
+     */
+    @PostMapping("/updatePlotByUUID")
+    public R updatePlotByUUID(@RequestBody Plotting plotting) {
+        return labelService.updatePlotByUUID(plotting);
+    }
+
+    @PostMapping("/updateOrder")
+    public R updateOrder(@RequestBody List<HashMap<String,Object>> list){
+        R result = labelService.updateOrder(list);
+        return result;
+    }
+
+    /**
+     * 查询目录列表--不分页
+     *
+     * @param folderId
+     * @return
+     */
+    @GetMapping("/listPlot")
+    public TableDataInfo listPlot(@RequestParam(required = false) Integer folderId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return labelService.listPlot(folderId,pageNum,pageSize);
+    }
+    /**
+     * 查询标绘列表
+     *
+     * @return
+     */
+    @GetMapping("/plottings")
+    public R plottings() {
+        return labelService.listAllPlot();
+    }
+
+    /**
+     * 修改标绘锁定状态
+     *
+     * @param id
+     * @param lockStatus
+     */
+    @GetMapping("/changeLockStatusPlot")
+    public R changeLockStatusPlot(@RequestParam("id") Integer id, @RequestParam("lockStatus") Integer lockStatus) {
+        return labelService.changeLockStatusPlot(id, lockStatus);
+    }
+
+    /**
+     * 修改标绘显示/隐藏状态
+     *
+     * @param id
+     * @param showStatus
+     * @return
+     */
+    @GetMapping("/changeShowStatusPlot")
+    public R changeShowStatusPlot(@RequestParam("id") Integer id, @RequestParam("showStatus") Integer showStatus) {
+        return labelService.changeShowStatusPlot(id, showStatus);
+    }
+
+    /**
+     * 修改标绘分享状态
+     *
+     * @param id
+     * @param shareStatus
+     * @return
+     */
+    @GetMapping("/changeShareStatusPlot")
+    public R changeShareStatusPlot(@RequestParam("id") Integer id, @RequestParam("shareStatus") Integer shareStatus) {
+        return labelService.changeShareStatusPlot(id, shareStatus);
+    }
+
+    @GetMapping("/collection")
+    public R plotCollection(@RequestParam Map<String,Object> params) {
+        return labelService.plotCollection(params);
+    }
+
+    @GetMapping("/infoByUuid")
+    public R<Plotting> infoByUuid(@RequestParam("uuid") String uuid) {
+        return labelService.infoByUuid(uuid);
+    }
+
+    @GetMapping("/deleteByUuid")
+    public R deleteByUuid(@RequestParam("uuid") String uuid) {
+        return labelService.deleteByUuid(uuid);
+    }
+
+    @GetMapping("/count")
+    public R count(PlottingQuery query) {
+        return labelService.count(query);
+    }
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/AppFolderParam.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/AppFolderParam.java
new file mode 100644
index 0000000..fff3c84
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/AppFolderParam.java
@@ -0,0 +1,39 @@
+package com.djhk.uav.label.domain;
+
+import com.djhk.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @description
+ * @author jiachengshuai
+ * @date 2023/9/5 09:20:07
+ * @version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppFolderParam
+{
+    /** appId */
+    @Excel(name = "appId")
+    private String appId;
+
+    /** 组织id */
+    @Excel(name = "组织id")
+    private Long orgId;
+
+    /** 项目编号 */
+    private String itemCode;
+
+    private Long id;
+
+    private List<AppOrderParam> orders;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/AppOrderParam.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/AppOrderParam.java
new file mode 100644
index 0000000..b090c1d
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/AppOrderParam.java
@@ -0,0 +1,26 @@
+package com.djhk.uav.label.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @description
+ * @author jiachengshuai
+ * @date 2023/9/5 09:20:07
+ * @version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppOrderParam
+{
+
+    private Long id;
+
+    private Integer order;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/CatalogueDto.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/CatalogueDto.java
new file mode 100644
index 0000000..ec3478c
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/CatalogueDto.java
@@ -0,0 +1,86 @@
+package com.djhk.uav.label.domain;
+
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CatalogueDto extends BaseEntity {
+
+
+    /**
+     * 目录ID
+     */
+    private Integer id;
+
+    /**
+     * 目录名称
+     */
+    private String name;
+
+    /**
+     * 类型，1标绘，2电子围栏，99模板目录（创建组织时需要复制该目录）
+     */
+    private Integer type;
+
+    /**
+     * appId
+     */
+    private String appId;
+
+    /**
+     * 组织id
+     */
+    private String orgId;
+
+    /**
+     * 父级目录id
+     */
+    private Long parentId;
+
+
+    /**
+     * 父级目录id
+     */
+    private Long folderId;
+
+    /**
+     * 锁定状态，0未锁定，1锁定
+     */
+    private Integer lockStatus;
+
+    /**
+     * 分享状态，0不分享，1分享
+     */
+    private Integer shareStatus;
+
+    /**
+     * showStatus
+     */
+    private Integer showStatusWeb;
+
+    /**
+     * showStatus
+     */
+    private Integer showStatusAPP;
+
+    /**
+     * 来源
+     */
+    private Integer source;
+
+    private Integer init;
+
+    private String couldDel;
+
+    private String data;
+
+    private List<CatalogueDto> children;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/CatalogueVo.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/CatalogueVo.java
new file mode 100644
index 0000000..a9714b1
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/CatalogueVo.java
@@ -0,0 +1,35 @@
+package com.djhk.uav.label.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CatalogueVo {
+    /** 目录ID */
+    private Long id;
+
+    /** 目录名称 */
+    private String name;
+
+    /** 类型，1标绘，2电子围栏，99模板目录（创建组织时需要复制该目录） */
+    private String type;
+
+    /** 父级目录id */
+    private String parentId;
+
+
+    /** 锁定状态，0未锁定，1锁定 */
+    private String lockStatus;
+
+
+    /** 分享状态，0不分享，1分享 */
+    private String  shareStatus;
+
+    /** showStatus */
+    private String  showStatus;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/FolderInfo.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/FolderInfo.java
new file mode 100644
index 0000000..0302160
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/FolderInfo.java
@@ -0,0 +1,95 @@
+package com.djhk.uav.label.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 目录信息对象 folder_info
+ *
+ * @author myk
+ * @date 2023-07-22
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FolderInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 目录名称 */
+    @Excel(name = "目录名称")
+    private String name;
+
+    /** 类型，1标绘，2电子围栏，99模板目录（创建组织时需要复制该目录） */
+    @Excel(name = "类型，1标绘，2电子围栏，99模板目录", readConverterExp = "创=建组织时需要复制该目录")
+    private Long type;
+
+    /** 父级目录 */
+    @Excel(name = "父级目录")
+    private Long parentId;
+
+    /** appId */
+    @Excel(name = "appId")
+    private String appId;
+
+    /** 组织id */
+    @Excel(name = "组织id")
+    private Long orgId;
+
+    /** 项目编号 */
+    private String itemCode;
+
+    /** 显隐状态，0显示，1隐藏 */
+    @Excel(name = "app显隐状态，0显示，1隐藏")
+    private Integer showStatusApp;
+
+    /** 显隐状态，0显示，1隐藏 */
+    @Excel(name = "web显隐状态，0显示，1隐藏")
+    private Integer showStatusWeb;
+
+    /** 锁定状态，0未锁定，1锁定 */
+    @Excel(name = "锁定状态，0未锁定，1锁定")
+    private Integer lockStatus;
+
+    /** 分享状态，0未分享，1分享 */
+    @Excel(name = "分享状态，0未分享，1分享")
+    private Integer shareStatus;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createUserId;
+
+    /** 更新人 */
+    @Excel(name = "更新人")
+    private Long updateUserId;
+
+    /** 删除时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deleteTime;
+
+    /** 删除人 */
+    @Excel(name = "删除人")
+    private Long deleteUserId;
+
+    private String delFlag;
+
+    private Integer source;
+
+    private Integer init;
+
+
+    private Integer order;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/PlotDTO.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/PlotDTO.java
new file mode 100644
index 0000000..11da673
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/PlotDTO.java
@@ -0,0 +1,68 @@
+package com.djhk.uav.label.domain;
+
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 标注管理DTO对象
+ *
+ * @author jwh
+ * @date 2023-7-26
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PlotDTO extends BaseEntity {
+
+    private Long id;
+    /** 模型名称 */
+    private String modelName;
+
+    /** 类型 */
+    private String modelType;
+
+    /** 模型id */
+    private String modelId;
+
+    /** 类型名称 */
+//    private String typeName;
+
+    /** 启用状态，0启用,1禁用 */
+    private String status;
+
+    /** 模型id */
+    private Long[] ids;
+
+//    /** 模型文件 */
+    private String file;
+
+    /** 外部文件连接 */
+    private String uploadUrl;
+
+    /** 组织id */
+    private Long orgId;
+
+    /** 备注描述 */
+    private String remark;
+
+    /** 经度 */
+    private String lng;
+
+    /** 纬度 */
+    private String lat;
+
+    /** 锁定状态，0未锁定，1锁定 */
+    private String lockStatus;
+
+    /** appId */
+    private String appId;
+
+    /** 模型url */
+    private String url;
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/PlotVo.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/PlotVo.java
new file mode 100644
index 0000000..9cf9ed8
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/PlotVo.java
@@ -0,0 +1,62 @@
+package com.djhk.uav.label.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PlotVo {
+
+    /** 目录ID */
+    private Long id;
+
+    /** 目录名称 */
+    private String name;
+
+    /** 类型，1标绘，2电子围栏，99模板目录（创建组织时需要复制该目录） */
+    private String type;
+
+    /** 父级目录id */
+    private String parentId;
+
+
+    /** 锁定状态，0未锁定，1锁定 */
+    private String lockStatus;
+
+
+    /** 分享状态，0不分享，1分享 */
+    private String  shareStatus;
+
+    /** showStatus */
+    private String  showStatus;
+
+    /** 组织id */
+    private Long orgId;
+
+
+    /** appId */
+    private String appId;
+
+    /** 文件夹id */
+    private String[] ids;
+
+    /** 备注描述 */
+    private String remark;
+
+    /** 经度 */
+    private String lng;
+
+    /** 纬度 */
+    private String lat;
+
+    /** 模型url */
+    private String url;
+
+    /** 高度 */
+    private String alt;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/Plotting.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/Plotting.java
new file mode 100644
index 0000000..9bb120b
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/Plotting.java
@@ -0,0 +1,147 @@
+package com.djhk.uav.label.domain;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 标绘对象 plotting
+ * 
+ * @author lwk
+ * @date 2023-07-22
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Plotting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 标绘名称 */
+    @Excel(name = "标绘名称")
+    private String name;
+
+    /** 标绘类型
+     point 点，
+     polyline 线，
+     polygon 多边形，
+     circle 圆，
+     rectangle 矩形
+     */
+    @Excel(name = "标绘类型，point 点，polyline 线，polygon 多边形，circle 圆， rectangle 矩形 ")
+    private String plottingType;
+
+    /** appId */
+    @Excel(name = "appId")
+    private String appId;
+
+    /** 组织id */
+    @Excel(name = "组织id")
+    private Long orgId;
+
+    /** 项目编号 */
+    private String itemCode;
+
+    /** 显隐状态，0显示，1隐藏 */
+    @Excel(name = "app显隐状态，0显示，1隐藏")
+    private Integer showStatusApp;
+
+    /** 显隐状态，0显示，1隐藏 */
+    @Excel(name = "web显隐状态，0显示，1隐藏")
+    private Integer showStatusWeb;
+
+    /** 锁定状态，0未锁定，1锁定 */
+    @Excel(name = "锁定状态，0未锁定，1锁定")
+    private Integer lockStatus;
+
+    /** 分享状态，0未分享，1分享 */
+    @Excel(name = "分享状态，0未分享，1分享")
+    private Integer shareStatus;
+
+    /** 数据类型，WKT、GeoJSON、KML、JSON */
+    @Excel(name = "数据类型，WKT、GeoJSON、KML、JSON")
+    private String dataType;
+
+    /** 分类，1标绘，2电子围栏 */
+    @Excel(name = "分类，1标绘，2电子围栏")
+    private Integer type;
+
+    /** 目录id */
+    @Excel(name = "目录id")
+    private Long folderId;
+
+    /** 删除状态，'0'未删除，'2'已删除 */
+    private String delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createUserId;
+
+    /** 更新人 */
+    @Excel(name = "更新人")
+    private Long updateUserId;
+
+    /** 删除人 */
+    @Excel(name = "删除人")
+    private Long deleteUserId;
+
+    /** 数据 */
+    @Excel(name = "数据")
+    private String data;
+
+    private Integer source;
+
+    private String uuid;
+
+    private Integer seq;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除者 */
+    private String deleteBy;
+
+    /** 删除时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deleteTime;
+
+
+    private Integer order;
+
+    /** 关联航线数量 */
+    private int airlineCount;
+
+    /** 1 起点  2 终点 */
+    private Integer relationType;
+
+
+    private String username;
+
+
+    private String folderName;
+
+
+    private Boolean share;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/PlottingQuery.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/PlottingQuery.java
new file mode 100644
index 0000000..3bd4065
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/PlottingQuery.java
@@ -0,0 +1,39 @@
+package com.djhk.uav.label.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class PlottingQuery {
+
+    private Long id;
+
+    @NotBlank
+    private String appId;
+
+    private String itemCode;
+
+    @NotNull
+    private Long orgId;
+
+    private List<Long> orgIds;
+
+    private Integer lockStatus;
+
+    private Integer showStatusWeb;
+
+    private Integer showStatusApp;
+
+    private Integer shareStatus;
+
+    private Long folderId;
+
+    private Long lastId;
+
+    private Integer type;
+
+    private String plottingType;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/SavePlotDto.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/SavePlotDto.java
new file mode 100644
index 0000000..cf731ae
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/SavePlotDto.java
@@ -0,0 +1,39 @@
+package com.djhk.uav.label.domain;
+
+import com.djhk.common.core.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SavePlotDto extends BaseEntity {
+
+    private String appId;
+
+    private Long orgId;
+
+    /** 模型名称 */
+    private String modelName;
+
+    /** 外部文件连接 */
+    private String uploadUrl;
+
+    /** 启用状态，0启用,1禁用 */
+    private String status;
+
+    /** 上传bucket,sts接口中获取*/
+    private String bucketName;
+
+    /** 文件名*/
+    private String fileName;
+
+    /** Json文件路径，下面有生成规则*/
+    private String  indexFilePath;
+
+    /** Json文件名，前端解析zip文件获取*/
+    private String  indexFileName;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/domain/vo/FolderVo.java b/djhk-system/src/main/java/com/djhk/uav/label/domain/vo/FolderVo.java
new file mode 100644
index 0000000..6301691
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/domain/vo/FolderVo.java
@@ -0,0 +1,75 @@
+package com.djhk.uav.label.domain.vo;
+
+
+import com.djhk.common.annotation.Excel;
+import com.djhk.uav.label.domain.Plotting;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class FolderVo {
+    /** $column.columnComment */
+    private Long id;
+
+    /** 目录名称 */
+    @Excel(name = "目录名称")
+    private String name;
+
+    /** 类型，1标绘，2电子围栏，99模板目录（创建组织时需要复制该目录） */
+    @Excel(name = "类型，1标绘，2电子围栏，99模板目录", readConverterExp = "创=建组织时需要复制该目录")
+    private Long type;
+
+    /** 父级目录 */
+    @Excel(name = "父级目录")
+    private Long parentId;
+
+    /** appId */
+    @Excel(name = "appId")
+    private String appId;
+
+    private String appName;
+
+    private String itemName;
+
+    private String orgName;
+
+    /** 组织id */
+    @Excel(name = "组织id")
+    private Long orgId;
+
+    /** 显隐状态，0显示，1隐藏 */
+    @Excel(name = "显隐状态，0显示，1隐藏")
+    private Integer showStatusApp;
+
+    @Excel(name = "显隐状态，0显示，1隐藏")
+    private Integer showStatusWeb;
+
+    /** 锁定状态，0未锁定，1锁定 */
+    @Excel(name = "锁定状态，0未锁定，1锁定")
+    private Integer lockStatus;
+
+    /** 分享状态，0未分享，1分享 */
+    @Excel(name = "分享状态，0未分享，1分享")
+    private Integer shareStatus;
+
+    @Excel(name = "1web 2app")
+    private Integer source;
+
+    //是否为系统创建目录，0否，1是
+    private Integer init;
+
+    //是否可以删除，0否，1是
+    private Integer couldDel;
+
+    private Date createTime;
+
+    //是否有标绘信息
+    private Boolean plottingStatus;
+
+    private List<FolderVo> children;
+
+    private List<Plotting> plottings;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/mapper/FolderInfoMapper.java b/djhk-system/src/main/java/com/djhk/uav/label/mapper/FolderInfoMapper.java
new file mode 100644
index 0000000..a49d9a1
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/mapper/FolderInfoMapper.java
@@ -0,0 +1,87 @@
+package com.djhk.uav.label.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.djhk.uav.label.domain.FolderInfo;
+import com.djhk.uav.label.domain.vo.FolderVo;
+import com.djhk.uav.label.query.FolderTreeQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 目录信息Mapper接口
+ *
+ * @author myk
+ * @date 2023-07-22
+ */
+public interface FolderInfoMapper extends BaseMapper<FolderInfo>
+{
+    /**
+     * 查询目录信息
+     *
+     * @param id 目录信息主键
+     * @return 目录信息
+     */
+    public FolderInfo selectFolderInfoById(Long id);
+
+    /**
+     * 查询目录信息列表
+     *
+     * @param folderInfo 目录信息
+     * @return 目录信息集合
+     */
+    public List<FolderInfo> selectFolderInfoList(FolderInfo folderInfo);
+
+    /**
+     * 新增目录信息
+     *
+     * @param folderInfo 目录信息
+     * @return 结果
+     */
+    public int insertFolderInfo(FolderInfo folderInfo);
+
+    /**
+     * 修改目录信息
+     *
+     * @param folderInfo 目录信息
+     * @return 结果
+     */
+    public int updateFolderInfo(FolderInfo folderInfo);
+
+    /**
+     * 删除目录信息
+     *
+     * @param id 目录信息主键
+     * @return 结果
+     */
+    public int deleteFolderInfoById(Long id);
+
+    /**
+     * 批量删除目录信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFolderInfoByIds(Long[] ids);
+
+    List<String> selectLockFolderNames(@Param("ids") List<Long> ids);
+
+    List<FolderVo> queryFolderVos(FolderTreeQuery query);
+
+    List<FolderVo> findFirstParentFolders(@Param("ids") List<Long> ids);
+
+    List<Long> selectIdsByParentIds(@Param("parentIds") List<Long> parentIds);
+
+    List<String> selectHaveLockPlottingFolders(@Param("ids") List<Long> allIds);
+
+    List<FolderInfo> selectSelfAndChildren(@Param("id") Long id);
+
+    int batchUpdateShowStatusApp(@Param("ids") List<Long> ids, @Param("showStatusApp") Integer showStatusApp);
+
+    int batchUpdateShowStatusWeb(@Param("ids") List<Long> ids, @Param("showStatusWeb") Integer showStatusWeb);
+
+    int batchUpdateShareStatus(@Param("ids")List<Long> ids, @Param("shareStatus")Integer shareStatus);
+
+    int changeLockStatus(@Param("ids") List<Long> ids, @Param("lockStatus") Integer lockStatus);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/mapper/PlottingMappers.java b/djhk-system/src/main/java/com/djhk/uav/label/mapper/PlottingMappers.java
new file mode 100644
index 0000000..fba88d7
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/mapper/PlottingMappers.java
@@ -0,0 +1,111 @@
+package com.djhk.uav.label.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.djhk.uav.label.domain.Plotting;
+import com.djhk.uav.label.domain.PlottingQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 标绘Mapper接口
+ *
+ * @author myk
+ * @date 2023-07-22
+ */
+public interface PlottingMappers extends BaseMapper<Plotting>
+{
+    /**
+     * 查询标绘
+     *
+     * @param id 标绘主键
+     * @return 标绘
+     */
+    public Plotting selectPlottingById(Long id);
+
+
+    public Plotting selectPlottingByUUId(String uuid);
+
+    /**
+     * 查询标绘列表
+     *
+     * @param plotting 标绘
+     * @return 标绘集合
+     */
+    public List<Plotting> selectPlottingList(Plotting plotting);
+
+    /**
+     * 新增标绘
+     *
+     * @param plotting 标绘
+     * @return 结果
+     */
+    public int insertPlotting(Plotting plotting);
+
+    /**
+     * 修改标绘
+     *
+     * @param plotting 标绘
+     * @return 结果
+     */
+    public int updatePlotting(Plotting plotting);
+
+
+    public int updatePlottingByUUId(Plotting plotting);
+
+    /**
+     * 删除标绘
+     *
+     * @param id 标绘主键
+     * @return 结果
+     */
+    public int deletePlottingById(Long id);
+
+    /**
+     * 批量删除标绘
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePlottingByIds(Long[] ids);
+
+    public int deletePlottingByUUId(String uuid);
+
+    /**
+     * 根据标绘名称 查出最大值
+     *
+     * @param name 用户名称
+     * @return 结果
+     */
+    public Integer selectSeqByPlottingName(@Param("name") String name);
+
+    int updateLockStatusByFolderId(@Param("folderId") Long folderId, @Param("lockStatus") Integer lockStatus);
+
+    Integer selectMaxLockStatusByFolderIdIds(@Param("folderIds") List<Long> folderIds);
+
+    int batchUpdateShowStatusAppByFolderId(@Param("folderIds") List<Long> folderIds, @Param("showStatusApp") Integer showStatusApp);
+
+    int batchUpdateShowStatusWebByFolderId(@Param("folderIds") List<Long> folderIds, @Param("showStatusWeb")Integer showStatusWeb);
+
+    int batchUpdateShareStatusByFolderId(@Param("folderIds") List<Long> ids, @Param("shareStatus") Integer shareStatus);
+
+    int batchInsertPlotting(@Param("plottings") List<Plotting> plotting);
+
+    int selectLockedNum(@Param("ids") Long[] ids);
+
+    int selectLockedNumByUUId(@Param("ids") String[] ids);
+
+    int changeLockStatus(@Param("id") Long id, @Param("lockStatus") Integer lockStatus);
+
+    int changeShareStatus(@Param("id") Long id, @Param("shareStatus") Integer shareStatus );
+
+    int changeShowStatusWeb(@Param("id") Long id, @Param("showStatus") Integer showStatus);
+
+    int changeShowStatusApp(@Param("id") Long id, @Param("showStatus") Integer showStatus);
+
+    List<Plotting> selectPlottingListById(PlottingQuery query);
+
+
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/query/FolderTreeQuery.java b/djhk-system/src/main/java/com/djhk/uav/label/query/FolderTreeQuery.java
new file mode 100644
index 0000000..3acf003
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/query/FolderTreeQuery.java
@@ -0,0 +1,29 @@
+package com.djhk.uav.label.query;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FolderTreeQuery {
+
+    private String name;
+
+    private String itemCode;
+
+    private String appId;
+
+    private Long orgId;
+
+    private Integer type;
+
+    private List<Long> parentIds;
+
+    private List<Long> ids;
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/service/LabelService.java b/djhk-system/src/main/java/com/djhk/uav/label/service/LabelService.java
new file mode 100644
index 0000000..ad10bcc
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/service/LabelService.java
@@ -0,0 +1,193 @@
+package com.djhk.uav.label.service;
+
+import com.djhk.common.core.domain.R;
+import com.djhk.common.core.page.TableDataInfo;
+import com.djhk.uav.label.domain.CatalogueDto;
+import com.djhk.uav.label.domain.Plotting;
+import com.djhk.uav.label.domain.PlottingQuery;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jwh
+ * @version 1.0
+ * @description
+ * @date 2023/7/26 14:42:10
+ */
+public interface LabelService {
+
+    R downloadPlot(List folderIds);
+
+    R uploadPlot(MultipartFile file);
+
+    /**
+     * 添加标注目录
+     *
+     * @param catalogueDto
+     * @return
+     */
+    R addCatalogue(CatalogueDto catalogueDto);
+
+    /**
+     * 删除目录
+     *
+     * @param ids
+     * @return
+     */
+    R deleteCatalogue(Integer[] ids);
+
+    /**
+     * 修改目录名称
+     *
+     * @param catalogueDto
+     * @return
+     */
+    R updateCatalogue(CatalogueDto catalogueDto);
+
+    /**
+     * 查询目录列表--不分页
+     *
+     * @param catalogueDto
+     * @return
+     */
+    R listCatalogue(CatalogueDto catalogueDto);
+
+
+    /**
+     * 修改目录锁定状态
+     *
+     * @param id
+     * @param lockStatus
+     * @return
+     */
+    R changeLockStatusCatalogue(Integer id, Integer lockStatus);
+
+
+    /**
+     * 修改目录显示/隐藏状态
+     *
+     * @param id
+     * @param showStatus
+     * @return
+     */
+    R changeShowStatusCatalogue(Integer id, Integer showStatus);
+
+    /**
+     * 修改目录显示/隐藏状态
+     *
+     * @param id
+     * @param shareStatus
+     * @return
+     */
+    R changeShareStatusCatalogue(Integer id, Integer shareStatus);
+
+
+    /**
+     * 添加标注目录
+     *
+     * @param plotting
+     * @return
+     */
+    R addPlotWeb(Plotting plotting);
+
+
+    R selectPlotByUuid(String uuid);
+
+    /**
+     * 删除目录
+     *
+     * @param ids
+     * @return
+     */
+    R deletePlot(Integer[] ids);
+
+    /**
+     * 修改目录名称
+     *
+     * @param catalogueDto
+     * @return
+     */
+    R updatePlot(CatalogueDto catalogueDto);
+
+    /**
+     * 修改标绘ByUUID
+     *
+     * @param plotting
+     * @return
+     */
+    R updatePlotByUUID(Plotting plotting);
+
+    /**
+     * 数据拖拽
+     *
+     * @param list
+     * @return
+     */
+    R updateOrder(List list);
+
+    /**
+     * 查询目录列表--不分页
+     *
+     * @param folderId
+     * @return
+     */
+    TableDataInfo listPlot(Integer folderId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 查询目录列表--不分页
+     *
+     * @return
+     */
+    R listAllPlot();
+    /**
+     * 修改标绘锁定状态
+     *
+     * @param id
+     * @param lockStatus
+     * @return
+     */
+    R changeLockStatusPlot(Integer id, Integer lockStatus);
+
+
+    /**
+     * 修改标绘显示/隐藏状态
+     *
+     * @param id
+     * @param showStatus
+     * @return
+     */
+    R changeShowStatusPlot(Integer id, Integer showStatus);
+
+    /**
+     * 修改标绘显示/隐藏状态
+     *
+     * @param id
+     * @param shareStatus
+     * @return
+     */
+    R changeShareStatusPlot(Integer id, Integer shareStatus);
+
+
+    /**
+     * 查询标会点列表
+     * @param params
+     * @return
+     */
+    R plotCollection(Map params);
+
+    /**
+     * 删除目录中所有的标绘
+     *
+     * @param ids
+     * @return
+     */
+    R deleteDirInner(Integer[] ids);
+
+    R<Plotting> infoByUuid(String uuid);
+
+    R deleteByUuid(String uuid);
+
+    R count(PlottingQuery query);
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/service/impl/AppFolderInfoServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/label/service/impl/AppFolderInfoServiceImpl.java
new file mode 100644
index 0000000..3952148
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/service/impl/AppFolderInfoServiceImpl.java
@@ -0,0 +1,505 @@
+package com.djhk.uav.label.service.impl;
+
+
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.djhk.common.core.domain.R;
+import com.djhk.common.utils.DateUtils;
+import com.djhk.uav.label.domain.AppFolderParam;
+import com.djhk.uav.label.domain.AppOrderParam;
+import com.djhk.uav.label.domain.FolderInfo;
+import com.djhk.uav.label.domain.Plotting;
+import com.djhk.uav.label.domain.vo.FolderVo;
+import com.djhk.uav.label.mapper.FolderInfoMapper;
+import com.djhk.uav.label.mapper.PlottingMappers;
+import com.djhk.uav.label.query.FolderTreeQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service("appFolderInfoService")
+public class AppFolderInfoServiceImpl {
+    @Autowired
+    private FolderInfoMapper folderInfoMapper;
+
+    @Autowired
+    private PlottingMappers plottingMapper;
+
+    /**
+     * 查询目录信息
+     *
+     * @param id 目录信息主键
+     * @return 目录信息
+     */
+
+    public FolderInfo selectFolderInfoById(Long id)
+    {
+        return folderInfoMapper.selectFolderInfoById(id);
+    }
+
+    /**
+     * 查询目录信息列表
+     *
+     * @param folderInfo 目录信息
+     * @return 目录信息
+     */
+
+    public List<FolderInfo> selectFolderInfoList(FolderInfo folderInfo)
+    {
+        return folderInfoMapper.selectFolderInfoList(folderInfo);
+    }
+
+    /**
+     * 新增目录信息
+     *
+     * @param folderInfo 目录信息
+     * @return 结果
+     */
+
+    public int insertFolderInfo(FolderInfo folderInfo)
+    {
+        folderInfo.setCreateTime(DateUtils.getNowDate());
+        return folderInfoMapper.insertFolderInfo(folderInfo);
+    }
+
+    /**
+     * 修改目录信息
+     *
+     * @param folderInfo 目录信息
+     * @return 结果
+     */
+
+    public R<String> updateFolderInfo(FolderInfo folderInfo)
+    {
+        FolderInfo folder = folderInfoMapper.selectFolderInfoById(folderInfo.getId());
+        if (folder == null) {
+            return R.fail("目录不存在");
+        }
+
+        if (
+                !folder.getAppId().equals(folderInfo.getAppId())
+                || !folder.getOrgId().equals(folderInfo.getOrgId())
+        ) {
+            return R.fail("目录不存在");
+        }
+
+        if (folder.getLockStatus() == 1) {
+            return R.fail("目录已锁定，不可修改");
+        }
+        folderInfo.setUpdateTime(DateUtils.getNowDate());
+        int i = folderInfoMapper.updateFolderInfo(folderInfo);
+        if (i > 0) {
+            return R.ok("修改成功");
+        }
+        return R.fail("修改失败");
+    }
+
+    /**
+     * 批量删除目录信息
+     *
+     * @param ids 需要删除的目录信息主键
+     * @return 结果
+     */
+
+    public R<String> deleteFolderInfoByIds(Long[] ids,String appId, Long orgId)
+    {
+        //1.查询所有属于这个
+        Integer count = folderInfoMapper.selectCount(
+                new QueryWrapper<FolderInfo>()
+                        .in("id", ids)
+                        .eq("app_id", appId)
+                        .eq("org_id", orgId)
+        );
+        if (count != ids.length) {
+            return R.fail("批量修改参数错误");
+        }
+        //查询所有子集目录id
+        List<Long> allIds = queryAllIds(new ArrayList<>(Arrays.asList(ids)));
+        //校验是否有锁定状态的目录，如果有，提示不可删除
+        List<String> lockFolders = folderInfoMapper.selectLockFolderNames(allIds);
+        if (!CollectionUtils.isEmpty(lockFolders)) {
+            return R.fail(JSON.toJSONString(lockFolders)+"已锁定，不允许删除");
+        }
+
+        //查询是否有锁定状态的标绘，如果有，不允许删除
+        List<String> haveLockPlottingFolders = folderInfoMapper.selectHaveLockPlottingFolders(allIds);
+        if (!CollectionUtils.isEmpty(haveLockPlottingFolders)) {
+            return R.fail(JSON.toJSONString(haveLockPlottingFolders)+"下有锁定标绘，不允许删除");
+        }
+        int i = folderInfoMapper.deleteFolderInfoByIds(allIds.toArray(new Long[allIds.size()]));
+        if (i > 0) {
+            return R.ok("删除成功");
+        }
+        return R.fail("删除失败");
+    }
+
+    @Transactional
+    public R<String> deleteFolderInfoByIdsV1(Long id,String appId, Long orgId)
+    {
+        Optional<FolderInfo> folderOpt = folderInfoMapper.selectList(
+                new QueryWrapper<FolderInfo>()
+                        .eq("id", id)
+                        .eq("app_id", appId)
+                        .eq("org_id", orgId)
+                        .eq("del_flag", "0")
+        ).stream().findFirst();
+        if (folderOpt.isEmpty()) {
+            return R.fail("目录为空");
+        }
+        //校验是否有锁定状态的目录，如果有，提示不可删除
+        List<String> lockFolders = folderInfoMapper.selectLockFolderNames(List.of(id));
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(lockFolders)) {
+            return R.fail("目录已被锁定,删除失败");
+        }
+
+        FolderInfo folderInfo = folderOpt.get();
+        //非默认目录
+        if(folderInfo.getInit() == 0){
+            folderInfoMapper.deleteFolderInfoByIds(new Long[]{folderInfo.getId()});
+        }
+        Plotting plotting = new Plotting();
+        plotting.setDelFlag("2");
+        plottingMapper.update(plotting,new LambdaQueryWrapper<Plotting>().eq(Plotting::getFolderId,folderInfo.getId()));
+        return R.ok();
+    }
+
+    /**
+     * 查询自身+所有下级id
+     * @param ids
+     * @return
+     */
+    private List<Long> queryAllIds(List<Long> ids) {
+        List<Long> childIds = List.copyOf(ids);
+        do {
+            childIds = folderInfoMapper.selectIdsByParentIds(childIds);
+            if (!CollectionUtils.isEmpty(childIds)) {
+                childIds = childIds.stream().filter(id -> !ids.contains(id)).collect(Collectors.toList());
+                ids.addAll(childIds);
+            }
+        }while (!CollectionUtils.isEmpty(childIds));
+        return ids;
+    }
+
+    /**
+     * 删除目录信息信息
+     *
+     * @param id 目录信息主键
+     * @return 结果
+     */
+
+    public int deleteFolderInfoById(Long id)
+    {
+        return folderInfoMapper.deleteFolderInfoById(id);
+    }
+
+
+    public R<List<FolderVo>> queryFolderTree(FolderTreeQuery query) {
+        checkAndCreateDefaultFolders(query.getAppId(),query.getOrgId());
+        List<FolderVo> folderVos = folderInfoMapper.queryFolderVos(query);
+        if (CollectionUtils.isEmpty(folderVos)) {
+            return R.ok();
+        }
+        List<FolderVo> folderVoList = folderVos.stream().map(this::checkFoldersWithPlotting).collect(Collectors.toList());
+        // TODO: 2023/9/22  文件目录只有一层
+//        List<Long> parentIds = folderVos.stream().map(f -> f.getParentId()).collect(Collectors.toList());
+//        List<FolderVo> allParentsFolder = findAllParentsFolder(parentIds);
+//        folderVos.addAll(allParentsFolder);
+        List<FolderVo> folderTree = getFolderTree(folderVoList);
+        return R.ok(folderTree);
+    }
+
+    private FolderVo checkFoldersWithPlotting(FolderVo folderVo) {
+        if(folderVo == null){
+            return new FolderVo();
+        }
+        Boolean share = false;
+        if(folderVo.getInit() == 1 && folderVo.getSource() == 2){
+            share = true;
+        }
+        folderVo.setPlottingStatus(false);
+        Plotting plotting = new Plotting();
+        plotting.setFolderId(folderVo.getId());
+        List<Plotting> plottings = plottingMapper.selectPlottingList(plotting);
+        if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(plottings)){
+            folderVo.setPlottingStatus(true);
+        }
+        for(Plotting plotting1 : plottings){
+            plotting1.setFolderName(folderVo.getName());
+            plotting1.setShare(share);
+        }
+        folderVo.setPlottings(plottings);
+        return folderVo;
+    }
+
+    private void checkAndCreateDefaultFolders(String appId,Long orgId) {
+        Integer count = folderInfoMapper.selectCount(
+                new QueryWrapper<FolderInfo>()
+                        .eq("app_id",appId)
+                        .eq("org_id",orgId)
+                        .eq("del_flag","0")
+                        .eq("type",1)
+                        .eq("init",1)
+        );
+
+        if (count == 0) {
+            List<FolderInfo> templateFolders = folderInfoMapper.selectList(
+                    new QueryWrapper<FolderInfo>()
+                            .eq("app_id", "-1")
+                            .eq("del_flag", "0")
+                            .eq("type", 1)
+                            .eq("init", 1)
+            );
+
+            if (!CollectionUtils.isEmpty(templateFolders)) {
+                for (FolderInfo templateFolder : templateFolders) {
+                    templateFolder.setAppId(appId);
+                    templateFolder.setOrgId(orgId);
+                    templateFolder.setCreateTime(new Date());
+                    templateFolder.setUpdateTime(new Date());
+                    folderInfoMapper.insertFolderInfo(templateFolder);
+                }
+            }
+        }
+    }
+
+    private List<FolderVo> getFolderTree(List<FolderVo> folderVos) {
+        folderVos = folderVos.stream().distinct().collect(Collectors.toList());
+        //筛选出所有parentId是0的根目录
+        List<FolderVo> root = folderVos.stream().filter(f -> f.getParentId() == 0).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(root)) {
+            return folderVos;
+        }
+
+        Map<Long, FolderVo> rootMap = root.stream().collect(Collectors.toMap(FolderVo::getId, FolderVo -> FolderVo));
+        List<FolderVo> children = folderVos.stream().filter(f -> f.getParentId() != 0).collect(Collectors.toList());
+
+        Integer childNums = children.size();
+        while (!CollectionUtils.isEmpty(children)) {
+            Map<Long, FolderVo> rootMapNew = new HashMap<>();
+            Map<Long, FolderVo> finalRootMap = rootMap;
+            children.removeIf(c -> {
+                FolderVo parent = finalRootMap.get(c.getParentId());
+                if (parent == null) {
+                    return false;
+                } else {
+                    List<FolderVo> childrenList = parent.getChildren();
+                    if (childrenList == null) {
+                        childrenList = new ArrayList<>();
+                        parent.setChildren(childrenList);
+                    }
+                    childrenList.add(c);
+                    rootMapNew.put(c.getId(),c);
+                    return true;
+                }
+            });
+
+            if (childNums == children.size()) {
+                break;
+            }
+            rootMap = rootMapNew;
+        }
+        return root;
+    }
+
+    private List<FolderVo> findAllParentsFolder(List<Long> parentIds) {
+        List<FolderVo> allParents = new ArrayList<>();
+        while (!CollectionUtils.isEmpty(parentIds)) {
+            List<FolderVo> firstParentFolders = findFirstParentFolders(parentIds);
+            allParents.addAll(firstParentFolders);
+            parentIds = firstParentFolders.stream().map(f -> f.getParentId()).collect(Collectors.toList());
+        }
+        return allParents;
+    }
+
+    private List<FolderVo> findFirstParentFolders(List<Long> ids) {
+        return folderInfoMapper.findFirstParentFolders(ids);
+    }
+
+
+    public R<String> changeParent(Long parentId, Long id,String appId, Long orgId) {
+
+        FolderInfo folderInfo = folderInfoMapper.selectFolderInfoById(id);
+        if (
+                folderInfo == null
+                || "2".equals(folderInfo.getDelFlag())
+                || !appId.equals(folderInfo.getAppId())
+                || !orgId.equals(folderInfo.getOrgId())
+        ) {
+            return R.fail("目录不存在");
+        }
+
+        FolderInfo parent = folderInfoMapper.selectFolderInfoById(parentId);
+        if (
+                parent == null
+                || "2".equals(parent.getDelFlag())
+                || !appId.equals(parent.getAppId())
+                || !orgId.equals(parent.getOrgId())
+        ) {
+            return R.fail("父级不存在");
+        }
+
+        //修改父级id
+        folderInfo.setParentId(parentId);
+        updateFolderInfo(folderInfo);
+
+        //修改当前文件夹及下级文件夹显隐、锁定、分享状态
+
+        return R.ok();
+    }
+
+    @Transactional
+
+    public R<String> changeLockStatus(Long id,Integer lockStatus,String appId, Long orgId) {
+        FolderInfo folderInfo = folderInfoMapper.selectFolderInfoById(id);
+        if (
+                folderInfo == null
+                || "2".equals(folderInfo.getDelFlag())
+                || !appId.equals(folderInfo.getAppId())
+                || !orgId.equals(folderInfo.getOrgId())
+        ) {
+            return R.fail("目录不存在");
+        }
+
+        List<FolderInfo> folderInfos = folderInfoMapper.selectSelfAndChildren(id);
+        List<Long> ids = folderInfos.stream().map(FolderInfo::getId).collect(Collectors.toList());
+        int i = folderInfoMapper.changeLockStatus(ids,lockStatus);
+        if (i > 0) {
+            plottingMapper.updateLockStatusByFolderId(id,lockStatus);
+        }
+        if (i > 0) {
+            plottingMapper.updateLockStatusByFolderId(id,lockStatus);
+        }
+        return R.ok();
+    }
+
+
+    @Transactional
+    public R<String> changeShowStatusWeb(Long id, Integer showStatus,String appId, Long orgId) {
+        FolderInfo folderInfo = folderInfoMapper.selectFolderInfoById(id);
+        if (
+                folderInfo == null
+                || "2".equals(folderInfo.getDelFlag())
+                || !appId.equals(folderInfo.getAppId())
+                || !orgId.equals(folderInfo.getOrgId())
+        ) {
+            return R.fail("目录不存在");
+        }
+
+        List<FolderInfo> folderInfos = folderInfoMapper.selectSelfAndChildren(id);
+        if (CollectionUtils.isEmpty(folderInfos)) {
+            return R.fail("目录不存在");
+        }
+
+        List<String> lockFolderNames = folderInfos.stream().filter(f -> f.getLockStatus() == 1).map(f -> f.getName()).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(lockFolderNames)) {
+            return R.fail(JSON.toJSONString(lockFolderNames)+"目录已锁定，修改失败");
+        }
+        List<Long> ids = folderInfos.stream().map(f -> f.getId()).collect(Collectors.toList());
+        Integer maxLockStatus = plottingMapper.selectMaxLockStatusByFolderIdIds(ids);
+        if (maxLockStatus == 1) {
+            return R.fail("目录下有锁定状态标绘，操作失败");
+        }
+
+        //修改所有目录
+        int i = folderInfoMapper.batchUpdateShowStatusWeb(ids,showStatus);
+        if (i > 0) {
+            plottingMapper.batchUpdateShowStatusWebByFolderId(ids,showStatus);
+        }
+        return R.ok();
+    }
+
+
+    public R<String> changeShareStatus(Long id, Integer shareStatus,String appId, Long orgId) {
+        FolderInfo folderInfo = folderInfoMapper.selectFolderInfoById(id);
+        if (
+                folderInfo == null
+                        || "2".equals(folderInfo.getDelFlag())
+                        || !appId.equals(folderInfo.getAppId())
+                        || !orgId.equals(folderInfo.getOrgId())
+        ) {
+            return R.fail("目录不存在");
+        }
+
+        List<FolderInfo> folderInfos = folderInfoMapper.selectSelfAndChildren(id);
+        if (CollectionUtils.isEmpty(folderInfos)) {
+            return R.fail("目录不存在");
+        }
+
+        List<String> lockFolderNames = folderInfos.stream().filter(f -> f.getLockStatus() == 1).map(f -> f.getName()).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(lockFolderNames)) {
+            return R.fail(JSON.toJSONString(lockFolderNames)+"目录已锁定，修改失败");
+        }
+        List<Long> ids = folderInfos.stream().map(f -> f.getId()).collect(Collectors.toList());
+        Integer maxLockStatus = plottingMapper.selectMaxLockStatusByFolderIdIds(ids);
+        if (maxLockStatus == 1) {
+            return R.fail("目录下有锁定状态标绘，操作失败");
+        }
+
+        //修改所有目录
+        int i = folderInfoMapper.batchUpdateShareStatus(ids,shareStatus);
+        if (i > 0) {
+            plottingMapper.batchUpdateShareStatusByFolderId(ids,shareStatus);
+        }
+        return R.ok();
+    }
+
+    public R<String> changeShareStatusV1(Long id, Integer shareStatus,String appId, Long orgId) {
+        FolderInfo folderInfo = folderInfoMapper.selectFolderInfoById(id);
+        if (
+                folderInfo == null
+                        || "2".equals(folderInfo.getDelFlag())
+                        || !appId.equals(folderInfo.getAppId())
+                        || !orgId.equals(folderInfo.getOrgId())
+        ) {
+            return R.fail("目录不存在");
+        }
+
+//        List<FolderInfo> folderInfos = folderInfoMapper.selectSelfAndChildren(id);
+//        if (CollectionUtils.isEmpty(folderInfos)) {
+//            return R.fail("目录不存在");
+//        }
+
+        if(folderInfo.getInit() == 1 && folderInfo.getSource() == 2){
+            return R.fail("暂不支持修改");
+        }
+        if(folderInfo.getLockStatus() == 1){
+            return R.fail("目录已锁定，修改失败");
+        }
+
+//        List<String> lockFolderNames = folderInfos.stream().filter(f -> f.getLockStatus() == 1).map(f -> f.getName()).collect(Collectors.toList());
+//        if (!CollectionUtils.isEmpty(lockFolderNames)) {
+//            return R.fail(JSON.toJSONString(lockFolderNames)+"目录已锁定，修改失败");
+//        }
+//        List<Long> ids = folderInfos.stream().map(f -> f.getId()).collect(Collectors.toList());
+//        Integer maxLockStatus = plottingMapper.selectMaxLockStatusByFolderIdIds(ids);
+//        if (maxLockStatus == 1) {
+//            return R.fail("目录下有锁定状态标绘，操作失败");
+//        }
+
+        //修改所有目录
+        int i = folderInfoMapper.batchUpdateShareStatus(List.of(id),shareStatus);
+        if (i > 0) {
+            plottingMapper.batchUpdateShareStatusByFolderId(List.of(id),shareStatus);
+        }
+        return R.ok();
+    }
+
+    public R<Map<String, Object>> orderFolder(AppFolderParam folderParam) {
+        Long id = folderParam.getId();
+        List<AppOrderParam> folderOrders = folderParam.getOrders();
+        for(AppOrderParam orderParam : folderOrders){
+            FolderInfo folderInfo = new FolderInfo();
+            folderInfo.setId(orderParam.getId());
+            folderInfo.setOrder(orderParam.getOrder());
+            folderInfo.setUpdateTime(DateUtils.getNowDate());
+
+            folderInfoMapper.updateById(folderInfo);
+        }
+        return R.ok(Map.of("id",id));
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/label/service/impl/LabelServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/label/service/impl/LabelServiceImpl.java
new file mode 100644
index 0000000..b7943b9
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/label/service/impl/LabelServiceImpl.java
@@ -0,0 +1,155 @@
+package com.djhk.uav.label.service.impl;
+
+
+import com.djhk.common.core.domain.R;
+import com.djhk.common.core.page.TableDataInfo;
+import com.djhk.uav.label.domain.CatalogueDto;
+import com.djhk.uav.label.domain.Plotting;
+import com.djhk.uav.label.domain.PlottingQuery;
+import com.djhk.uav.label.service.LabelService;
+import lombok.val;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author jwh
+ * @version 1.0
+ * @description
+ * @date 2023/7/26 14:44:10
+ */
+@Service
+public class LabelServiceImpl implements LabelService {
+
+
+    @Override
+    public R downloadPlot(List folderIds) {
+        return null;
+    }
+
+    @Override
+    public R uploadPlot(MultipartFile file) {
+        return null;
+    }
+
+    @Override
+    public R addCatalogue(CatalogueDto catalogueDto) {
+        return null;
+    }
+
+    @Override
+    public R deleteCatalogue(Integer[] ids) {
+        return null;
+    }
+
+    @Override
+    public R updateCatalogue(CatalogueDto catalogueDto) {
+        return null;
+    }
+
+    @Override
+    public R listCatalogue(CatalogueDto catalogueDto) {
+        return null;
+    }
+
+    @Override
+    public R changeLockStatusCatalogue(Integer id, Integer lockStatus) {
+        return null;
+    }
+
+    @Override
+    public R changeShowStatusCatalogue(Integer id, Integer showStatus) {
+        return null;
+    }
+
+    @Override
+    public R changeShareStatusCatalogue(Integer id, Integer shareStatus) {
+        return null;
+    }
+
+    @Override
+    public R addPlotWeb(Plotting plotting) {
+        return null;
+    }
+
+    @Override
+    public R selectPlotByUuid(String uuid) {
+        return null;
+    }
+
+    @Override
+    public R deletePlot(Integer[] ids) {
+        return null;
+    }
+
+    @Override
+    public R updatePlot(CatalogueDto catalogueDto) {
+        return null;
+    }
+
+    @Override
+    public R updatePlotByUUID(Plotting plotting) {
+        return null;
+    }
+
+    @Override
+    public R updateOrder(List list) {
+        return null;
+    }
+
+    @Override
+    public TableDataInfo listPlot(Integer folderId, Integer pageNum, Integer pageSize) {
+        return null;
+    }
+
+    @Override
+    public R listAllPlot() {
+        return null;
+    }
+
+    @Override
+    public R changeLockStatusPlot(Integer id, Integer lockStatus) {
+        return null;
+    }
+
+    @Override
+    public R changeShowStatusPlot(Integer id, Integer showStatus) {
+        return null;
+    }
+
+    @Override
+    public R changeShareStatusPlot(Integer id, Integer shareStatus) {
+        return null;
+    }
+
+    @Override
+    public R plotCollection(Map params) {
+        return null;
+    }
+
+    @Override
+    public R deleteDirInner(Integer[] ids) {
+        return null;
+    }
+
+    @Override
+    public R<Plotting> infoByUuid(String uuid) {
+        return null;
+    }
+
+    @Override
+    public R deleteByUuid(String uuid) {
+        return null;
+    }
+
+    @Override
+    public R count(PlottingQuery query) {
+        return null;
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/uav/domain/UavOperatorExportVo.java b/djhk-system/src/main/java/com/djhk/uav/uav/domain/UavOperatorExportVo.java
new file mode 100644
index 0000000..39b4983
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/uav/domain/UavOperatorExportVo.java
@@ -0,0 +1,28 @@
+package com.djhk.uav.uav.domain;
+
+import com.djhk.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class UavOperatorExportVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private List<Integer> ids;
+
+    private List<Long> orgIds;
+
+    private String userName;
+
+    /** 最后一次执行任务时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后一次执行任务时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planTime;
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/uav/service/IUavOperatorService.java b/djhk-system/src/main/java/com/djhk/uav/uav/service/IUavOperatorService.java
new file mode 100644
index 0000000..9d0e96c
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/uav/service/IUavOperatorService.java
@@ -0,0 +1,69 @@
+package com.djhk.uav.uav.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.djhk.uav.airspace.domain.UavOperator;
+import com.djhk.uav.uav.domain.UavOperatorExportVo;
+
+import java.util.List;
+
+/**
+ * 飞手管理Service接口
+ *
+ * @author jiachengshuai
+ * @date 2022-08-30
+ */
+public interface IUavOperatorService extends IService<UavOperator>
+{
+    /**
+     * 查询飞手管理
+     *
+     * @param id 飞手管理主键
+     * @return 飞手管理
+     */
+    public UavOperator selectUavOperatorById(Long id);
+
+    /**
+     * 查询飞手管理列表
+     *
+     * @param uavOperator 飞手管理
+     * @return 飞手管理集合
+     */
+    public List<UavOperator> selectUavOperatorList(UavOperator uavOperator);
+
+    /**
+     * 新增飞手管理
+     *
+     * @param uavOperator 飞手管理
+     * @return 结果
+     */
+    public int insertUavOperator(UavOperator uavOperator);
+
+    /**
+     * 修改飞手管理
+     *
+     * @param uavOperator 飞手管理
+     * @return 结果
+     */
+    public int updateUavOperator(UavOperator uavOperator);
+
+    /**
+     * 批量删除飞手管理
+     *
+     * @param ids 需要删除的飞手管理主键集合
+     * @return 结果
+     */
+    public int deleteUavOperatorByIds(Long[] ids);
+
+    /**
+     * 删除飞手管理信息
+     *
+     * @param id 飞手管理主键
+     * @return 结果
+     */
+    public int deleteUavOperatorById(Long id);
+
+    public List<UavOperator> selectUavOperatorExportList(UavOperatorExportVo uavOperatorExportVo);
+
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/uav/service/impl/UavOperatorServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/uav/service/impl/UavOperatorServiceImpl.java
new file mode 100644
index 0000000..5ca596d
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/uav/service/impl/UavOperatorServiceImpl.java
@@ -0,0 +1,110 @@
+package com.djhk.uav.uav.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.djhk.uav.airspace.domain.UavOperator;
+import com.djhk.uav.uav.domain.UavOperatorExportVo;
+import com.djhk.uav.uav.service.IUavOperatorService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+
+/**
+ * 飞手管理Service业务层处理
+ *
+ * @author jiachengshuai
+ * @date 2022-08-30
+ */
+@Service
+@Slf4j
+public class UavOperatorServiceImpl  implements IUavOperatorService
+{
+
+
+    @Override
+    public UavOperator selectUavOperatorById(Long id) {
+        return null;
+    }
+
+    @Override
+    public List<UavOperator> selectUavOperatorList(UavOperator uavOperator) {
+        return null;
+    }
+
+    @Override
+    public int insertUavOperator(UavOperator uavOperator) {
+        return 0;
+    }
+
+    @Override
+    public int updateUavOperator(UavOperator uavOperator) {
+        return 0;
+    }
+
+    @Override
+    public int deleteUavOperatorByIds(Long[] ids) {
+        return 0;
+    }
+
+    @Override
+    public int deleteUavOperatorById(Long id) {
+        return 0;
+    }
+
+    @Override
+    public List<UavOperator> selectUavOperatorExportList(UavOperatorExportVo uavOperatorExportVo) {
+        return null;
+    }
+
+    @Override
+    public boolean saveBatch(Collection<UavOperator> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdateBatch(Collection<UavOperator> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean updateBatchById(Collection<UavOperator> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdate(UavOperator entity) {
+        return false;
+    }
+
+    @Override
+    public UavOperator getOne(Wrapper<UavOperator> queryWrapper, boolean throwEx) {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> getMap(Wrapper<UavOperator> queryWrapper) {
+        return null;
+    }
+
+    @Override
+    public <V> V getObj(Wrapper<UavOperator> queryWrapper, Function<? super Object, V> mapper) {
+        return null;
+    }
+
+    @Override
+    public BaseMapper<UavOperator> getBaseMapper() {
+        return null;
+    }
+
+    @Override
+    public Class<UavOperator> getEntityClass() {
+        return null;
+    }
+}
diff --git a/djhk-system/src/main/java/com/djhk/uav/utils/ExportWord.javatxt b/djhk-system/src/main/java/com/djhk/uav/utils/ExportWord.javatxt
new file mode 100644
index 0000000..dc75af0
--- /dev/null
+++ b/djhk-system/src/main/java/com/djhk/uav/utils/ExportWord.javatxt
@@ -0,0 +1,97 @@
+package com.djhk.uav.utils;
+
+
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.Map;
+
+/**
+ * @ClassName: ExportWord
+ * @Description: 导出word工具类
+ * @Authror: XQD
+ * @Date: 2023/6/16 15:59
+ */
+public class ExportWord {
+
+    private Configuration configuration;
+    private String encoding;
+    private String exportPath = "D:\\data";
+
+    /**
+     * 构造函数
+     * 配置模板路径
+     * @param encoding
+     */
+    public ExportWord(String encoding) {
+        this.encoding = encoding;
+        configuration = new Configuration();
+        configuration.setDefaultEncoding(encoding);
+        configuration.setClassForTemplateLoading(this.getClass(), "/templates");
+    }
+
+    /**
+     * 导出word文档到客户端
+     * @param response
+     * @param fileName
+     * @param tplName
+     * @param data
+     * @throws Exception
+     */
+    public void exportDoc(HttpServletResponse response, String fileName, String tplName, Map<String, Object> data, FreeMarkerConfigurer freeMarkerConfigurer) throws Exception {
+        response.reset();
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setCharacterEncoding("UTF-8");
+        response.setContentType("application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=" +  URLEncoder.encode(fileName , "UTF-8"));
+        // 把本地文件发送给客户端
+        Writer writer = response.getWriter();
+        Template template = getTemplate(tplName, freeMarkerConfigurer);
+        template.process(data, writer);
+        writer.close();
+    }
+
+    /**
+     * 导出word文档到指定目录
+     * @param fileName
+     * @param tplName
+     * @param data
+     * @throws Exception
+     */
+    public void exportDocFile(String fileName, String tplName, Map<String, Object> data) throws Exception {
+        //如果目录不存在，则创建目录
+        File exportDirs = new File(exportPath);
+        if (!exportDirs.exists()) {
+            exportDirs.mkdirs();
+        }
+        Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(exportPath + fileName), encoding));
+        getTemplate(tplName).process(data, writer);
+    }
+
+    /**
+     * 获取模板 打成jar包后获取不到模板的方式 freeMarkerConfigurer
+     * @param name
+     * @return
+     * @throws Exception
+     */
+    public Template getTemplate(String name, FreeMarkerConfigurer freeMarkerConfigurer) throws Exception {
+        Configuration configuration = new Configuration();
+        configuration.setClassForTemplateLoading(this.getClass(), "/templete");
+        Template template = configuration.getTemplate(name);
+        return template;
+    }
+
+    /**
+     * 获取模板
+     * @param name
+     * @return
+     * @throws Exception
+     */
+    public Template getTemplate(String name) throws Exception {
+        return configuration.getTemplate(name);
+    }
+}
diff --git a/djhk-system/src/main/resources/mapper/airspace/airplaneAirspaceMapper.xml b/djhk-system/src/main/resources/mapper/airspace/airplaneAirspaceMapper.xml
new file mode 100644
index 0000000..6d12bd3
--- /dev/null
+++ b/djhk-system/src/main/resources/mapper/airspace/airplaneAirspaceMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.djhk.uav.airspace.mapper.AirplaneAirspaceMapper">
+
+    <resultMap type="com.djhk.uav.airspace.domain.AirplaneApplyAirspace" id="AirplaneApplyResult">
+        <result column="id"         property="id"/>
+        <result column="airplane_apply_id" property="airplaneApplyId"/>
+        <result column="airspace_id"  property="airspaceId"/>
+    </resultMap>
+
+    <sql id="selectAirplaneApplyVo">
+        select id,
+        airplane_apply_id,
+        airspace_id
+        from
+        airplane_apply_airspace
+    </sql>
+
+    <select id="selectAirplaneAirspaceApplyList" parameterType="Long" resultMap="AirplaneApplyResult">
+        <include refid="selectAirplaneApplyVo"/>
+        WHERE airplane_apply_id = #{airplaneApplyId}
+    </select>
+
+    <insert id="insertAirplaneAirspaceApply" parameterType="com.djhk.uav.airspace.domain.AirplaneApplyAirplane">
+        insert into airplane_apply_airspace
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="airplaneApplyId != null">airplane_apply_id, </if>
+            <if test="airspaceId != null">airspace_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="airplaneApplyId != null">#{airplaneApplyId},</if>
+            <if test="airspaceId != null">#{airspaceId},</if>
+        </trim>
+    </insert>
+
+    <delete id="deleteAirplaneAirspaceApplyByAirspaceId" parameterType="Long">
+        DELETE FROM airplane_apply_airspace
+        WHERE airplane_apply_id = #{airplaneApplyId}
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/djhk-system/src/main/resources/mapper/airspace/airplaneFlyMapper.xml b/djhk-system/src/main/resources/mapper/airspace/airplaneFlyMapper.xml
new file mode 100644
index 0000000..9d6813b
--- /dev/null
+++ b/djhk-system/src/main/resources/mapper/airspace/airplaneFlyMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.djhk.uav.airspace.mapper.AirplaneFlyMapper">
+
+    <resultMap type="com.djhk.uav.airspace.domain.AirplaneApplyAirplane" id="AirplaneApplyResult">
+        <result column="id"         property="id"/>
+        <result column="airplane_apply_id" property="airplaneApplyId"/>
+        <result column="airplane_id"  property="airplaneId"/>
+        <result column="model_id"  property="modelId"/>
+    </resultMap>
+
+    <sql id="selectAirplaneApplyVo">
+        select id,
+        airplane_apply_id,
+        airplane_id,
+        model_id
+        from
+        airplane_apply_airplane
+    </sql>
+
+    <select id="selectAirplaneFlyApplyList" parameterType="Long" resultMap="AirplaneApplyResult">
+        <include refid="selectAirplaneApplyVo"/>
+        WHERE airplane_apply_id = #{airplaneApplyId}
+    </select>
+
+    <insert id="insertAirplaneFlyApply" parameterType="com.djhk.uav.airspace.domain.AirplaneApplyAirplane">
+        insert into airplane_apply_airplane
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="airplaneApplyId != null">airplane_apply_id, </if>
+            <if test="airplaneId != null">airplane_id, </if>
+            <if test="modelId != null">model_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="airplaneApplyId != null">#{airplaneApplyId},</if>
+            <if test="airplaneId != null">#{airplaneId},</if>
+            <if test="modelId != null">#{modelId},</if>
+        </trim>
+    </insert>
+
+    <delete id="deleteAirplaneFlyApplyByFlyId" parameterType="Long">
+        DELETE FROM airplane_apply_airplane
+        WHERE airplane_apply_id = #{airplaneApplyId}
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/djhk-system/src/main/resources/mapper/airspace/airplaneMapper.xml b/djhk-system/src/main/resources/mapper/airspace/airplaneMapper.xml
new file mode 100644
index 0000000..916c5c6
--- /dev/null
+++ b/djhk-system/src/main/resources/mapper/airspace/airplaneMapper.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.djhk.uav.airspace.mapper.AirplaneMapper">
+
+    <resultMap type="com.djhk.uav.airspace.domain.AirplaneApply" id="AirplaneApplyResult">
+        <result column="id"         property="id"/>
+        <result column="sts" property="sts"/>
+        <result column="dept_id"  property="deptId"/>
+        <result column="name"  property="name"/>
+        <result column="type"  property="type"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="flyTime" column="fly_time"/>
+        <result property="remark" column="remark"/>
+        <result property="taskProp" column="task_prop"/>
+        <result property="finalUrl" column="final_url"/>
+        <result property="proUrl" column="pro_url"/>
+    </resultMap>
+
+    <sql id="selectAirplaneApplyVo">
+        select id,
+        sts,
+        dept_id,
+        name,
+        create_by,
+        create_time,
+        fly_time,
+        remark,
+        task_prop,
+        tel,
+        final_url,
+        pro_url,
+        create_by
+        from
+        airplane_apply
+    </sql>
+
+    <select id="selectAirplaneApplyList" parameterType="com.djhk.uav.airspace.domain.AirplaneApply" resultMap="AirplaneApplyResult">
+        <include refid="selectAirplaneApplyVo"/>
+        <where>
+            <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
+            <if test="sts != null and sts != ''"> and sts = #{sts}</if>
+            <if test="type != null and type != ''"> and type = #{type}</if>
+            <if test="taskProp != null and taskProp != ''"> and task_prop = #{taskProp}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(fly_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(fly_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+<!--            <if test="deptId != null and deptId != '' ">-->
+<!--                AND (dept_id = #{deptId} OR dept_id IN ( SELECT dept_id FROM sys_dept WHERE-->
+<!--                find_in_set(#{deptId}, ancestors) ))-->
+<!--            </if>-->
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectAirplaneApplyLists" parameterType="com.djhk.uav.airspace.domain.AirplaneApply" resultMap="AirplaneApplyResult">
+        <include refid="selectAirplaneApplyVo"/>
+        <where>
+            <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
+            <if test="sts != null and sts != ''"> and sts = #{sts}</if>
+            <if test="type != null and type != ''"> and type = #{type}</if>
+            <if test="taskProp != null and taskProp != ''"> and task_prop = #{taskProp}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(fly_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(fly_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+        order by create_time asc
+    </select>
+
+    <select id="selectAirplaneApplyId" parameterType="Long" resultMap="AirplaneApplyResult">
+        select max(id) as id
+        from
+        airplane_apply
+    </select>
+
+    <select id="selectAirplaneApplyById" parameterType="Long" resultMap="AirplaneApplyResult">
+        <include refid="selectAirplaneApplyVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAirplaneApply" parameterType="com.djhk.uav.airspace.domain.AirplaneApply">
+        insert into airplane_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name, </if>
+            <if test="type != null">type, </if>
+            <if test="sts != null">sts,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="flyTime != null">fly_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="remark != null">remark,</if>
+            <if test="taskProp != null">task_prop,</if>
+            <if test="tel != null">tel,</if>
+            <if test="proUrl != null">pro_url,</if>
+            <if test="finalUrl != null">final_url,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="type != null">#{type},</if>
+            <if test="sts != null">#{sts},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="flyTime != null">#{flyTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="taskProp != null">#{taskProp},</if>
+            <if test="tel != null">#{tel},</if>
+            <if test="proUrl != null">#{proUrl},</if>
+            <if test="finalUrl != null">#{finalUrl},</if>
+        </trim>
+    </insert>
+
+
+    <update id="updateAirplaneApply" parameterType="com.djhk.uav.airspace.domain.AirplaneApply">
+        update airplane_apply
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="sts != null">sts = #{sts},</if>
+            <if test="flyTime != null"> fly_time = #{flyTime} ,</if>
+            <if test="remark != null"> remark = #{remark} ,</if>
+            <if test="taskProp != null"> task_prop = #{taskProp} ,</if>
+            <if test="tel != null"> tel = #{tel} ,</if>
+            <if test="proUrl != null"> pro_url = #{proUrl} ,</if>
+            <if test="finalUrl != null"> final_url = #{finalUrl} ,</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAirplaneApplyById" parameterType="Long">
+        DELETE FROM airplane_apply
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteAirplaneApplyByIds" parameterType="String">
+        delete from airplane_apply where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/djhk-system/src/main/resources/mapper/airspace/airplaneOperatorMapper.xml b/djhk-system/src/main/resources/mapper/airspace/airplaneOperatorMapper.xml
new file mode 100644
index 0000000..5d542d7
--- /dev/null
+++ b/djhk-system/src/main/resources/mapper/airspace/airplaneOperatorMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.djhk.uav.airspace.mapper.AirplaneOperatorMapper">
+
+    <resultMap type="com.djhk.uav.airspace.domain.AirplaneApplyOperator" id="AirplaneApplyResult">
+        <result column="id"         property="id"/>
+        <result column="airplane_apply_id" property="airplaneApplyId"/>
+        <result column="operator_id"  property="operatorId"/>
+    </resultMap>
+
+    <sql id="selectAirplaneApplyVo">
+        select id,
+        airplane_apply_id,
+        operator_id
+        from
+        airplane_apply_operator
+    </sql>
+
+    <select id="selectAirplaneOperatorApplyList" parameterType="Long" resultMap="AirplaneApplyResult">
+        <include refid="selectAirplaneApplyVo"/>
+        WHERE airplane_apply_id = #{airplaneApplyId}
+    </select>
+
+    <insert id="insertAirplaneOperatorApply" parameterType="com.djhk.uav.airspace.domain.AirplaneApplyOperator">
+        insert into airplane_apply_operator
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="airplaneApplyId != null">airplane_apply_id, </if>
+            <if test="operatorId != null">operator_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="airplaneApplyId != null">#{airplaneApplyId},</if>
+            <if test="operatorId != null">#{operatorId},</if>
+        </trim>
+    </insert>
+
+    <delete id="deleteAirplaneApplyByOperatorId" parameterType="Long">
+        DELETE FROM airplane_apply_operator
+        WHERE airplane_apply_id = #{airplaneApplyId}
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/djhk-system/src/main/resources/mapper/airspace/airspaceMapper.xml b/djhk-system/src/main/resources/mapper/airspace/airspaceMapper.xml
new file mode 100644
index 0000000..07f9fb8
--- /dev/null
+++ b/djhk-system/src/main/resources/mapper/airspace/airspaceMapper.xml
@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.djhk.uav.airspace.mapper.AirspaceMapper">
+
+    <resultMap type="com.djhk.uav.airspace.domain.AirspaceApply" id="AirspaceApplyResult">
+        <result column="id"         property="id"/>
+        <result column="apply_time" property="applyTime"/>
+        <result column="user_type"  property="userType"/>
+        <result column="user_name"  property="userName"/>
+        <result column="dept_type"  property="deptType"/>
+        <result column="dept_code"  property="deptCode"/>
+        <result column="dept_pname" property="deptPname"/>
+        <result column="phone"       property="phone"/>
+        <result column="email"       property="email"/>
+        <result column="plan_type" property="planType"/>
+        <result column="max_hegiht" property="maxHegiht"/>
+        <result column="plan_beg" property="planBeg"/>
+        <result column="plan_end" property="planEnd"/>
+        <result column="txll" property="txll"/>
+        <result column="task_type" property="taskType"/>
+        <result column="opt_type" property="optType"/>
+        <result column="fly_type" property="flyType"/>
+        <result column="remark_qjbj" property="remarkQjbj"/>
+        <result column="remark_yjcz" property="remarkYjcz"/>
+        <result column="remark_tsxq" property="remarkTsxq"/>
+        <result column="remark_tdjn" property="remarkTdjn"/>
+        <result column="remark_fxhx" property="remarkFxhx"/>
+        <result column="remark_zhkz" property="remarkZhkz"/>
+        <result column="remark_ecld" property="remarkEcld"/>
+        <result column="remark_qtxx" property="remarkQtxx"/>
+        <result column="six" property="six"/>
+        <result column="spaces" property="spaces"/>
+        <result column="files" property="files"/>
+        <result column="apply_sts" property="applySts"/>
+        <result column="apply_dsc" property="applyDsc"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="hight_max" property="hightMax"/>
+        <result column="hight_min" property="hightMin"/>
+        <result column="lat" property="lat"/>
+        <result column="lng" property="lng"/>
+        <result column="military_area_name" property="militaryAreaName"/>
+        <result column="military_area_id" property="militaryAreaId"/>
+        <result column="name" property="name"/>
+        <result column="flight_rule" property="flightRule"/>
+        <result column="airspace_type" property="airspaceType"/>
+        <result column="airspace_prop" property="airspaceProp"/>
+        <result column="rad_length" property="radLength"/>
+        <result column="uuid" property="uuid"/>
+        <result column="dept_id" property="deptId"/>
+    </resultMap>
+
+    <sql id="selectAirspaceApplyVo">
+        select id,
+        apply_time,
+        user_type,
+        user_name,
+        dept_type,
+        dept_code,
+        dept_pname,
+        phone,
+        email,
+        plan_type,
+        max_hegiht,
+        plan_beg,
+        plan_end,
+        txll,
+        task_type,
+        opt_type,
+        fly_type,
+        remark_qjbj,
+        remark_yjcz,
+        remark_tsxq,
+        remark_tdjn,
+        remark_fxhx,
+        remark_zhkz,
+        remark_ecld,
+        remark_qtxx,
+        six,
+        spaces,
+        files,
+        apply_sts,
+        apply_dsc,
+        create_by,
+        update_by,
+        create_time,
+        update_time,
+        hight_max,
+        hight_min,
+        lat,
+        lng,
+        military_area_name,
+        military_area_id,
+        name,
+        flight_rule,
+        airspace_type,
+        airspace_prop,
+        rad_length,
+        uuid
+        from
+        airspace_apply
+    </sql>
+
+    <select id="selectAirspaceApplyList" parameterType="com.djhk.uav.airspace.domain.AirspaceApply" resultMap="AirspaceApplyResult">
+        <include refid="selectAirspaceApplyVo"/>
+        <where>
+            <if test="applySts != null and applySts != ''"> and apply_sts = #{applySts}</if>
+            <if test="taskType != null  and taskType != ''"> and task_type = #{taskType}</if>
+            <if test="optType != null  and optType != ''"> and opt_type = #{optType}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="flyType != null  and flyType != ''"> and fly_type = #{flyType}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(apply_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(apply_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
+            <if test="deptId != null and deptId != '' ">
+                AND (dept_id = #{deptId} OR dept_id IN ( SELECT dept_id FROM sys_dept WHERE
+                find_in_set(#{deptId}, ancestors) ))
+            </if>
+        </where>
+        order by create_time asc
+    </select>
+
+    <select id="selectAirspaceApplyId" parameterType="Long" resultMap="AirspaceApplyResult">
+        select max(id)
+        from
+        airspace_apply
+    </select>
+
+    <select id="selectAirspaceApplyById" parameterType="Long" resultMap="AirspaceApplyResult">
+        <include refid="selectAirspaceApplyVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAirspaceApply" parameterType="com.djhk.uav.airspace.domain.AirspaceApply">
+        insert into airspace_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="applyTime != null">apply_time, </if>
+            <if test="userType != null">user_type,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="deptType != null">dept_type,</if>
+            <if test="deptCode != null">dept_code,</if>
+            <if test="deptPname != null">dept_pname,</if>
+            <if test="phone != null">phone,</if>
+            <if test="email != null">email,</if>
+            <if test="planType != null">plan_type},</if>
+            <if test="maxHegiht != null">max_hegiht,</if>
+            <if test="planBeg != null">plan_beg,</if>
+            <if test="planEnd != null">plan_end,</if>
+            <if test="txll != null">txll,</if>
+            <if test="taskType != null">task_type,</if>
+            <if test="optType != null">opt_type,</if>
+            <if test="flyType != null">fly_type},</if>
+            <if test="remarkQjbj != null">remark_qjbj,</if>
+            <if test="remarkYjcz != null">remark_yjcz,</if>
+            <if test="remarkTsxq != null">remark_tsxq,</if>
+            <if test="remarkTdjn != null">remark_tdjn,</if>
+            <if test="remarkFxhx != null">remark_fxhx,</if>
+            <if test="remarkZhkz != null">remark_zhkz,</if>
+            <if test="remarkEcld != null">remark_ecld,</if>
+            <if test="remarkQtxx != null">remark_qtxx,</if>
+            <if test="six != null">six,</if>
+            <if test="spaces != null">spaces,</if>
+            <if test="files != null">files,</if>
+            <if test="applySts != null">apply_sts,</if>
+            <if test="applyDsc != null">apply_dsc,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="hightMax != null">hight_max,</if>
+            <if test="hightMin != null">hight_min,</if>
+            <if test="lat != null">lat,</if>
+            <if test="lng != null">lng,</if>
+            <if test="militaryAreaName != null">military_area_name,</if>
+            <if test="militaryAreaId != null">military_area_id,</if>
+            <if test="name != null">name,</if>
+            <if test="flightRule != null">flight_rule,</if>
+            <if test="airspaceType != null">airspace_type,</if>
+            <if test="airspaceProp != null">airspace_prop,</if>
+            <if test="radLength != null">rad_length,</if>
+            <if test="uuid != null">uuid,</if>
+            <if test="deptId != null">dept_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="userType != null">#{userType},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="deptType != null">#{deptType},</if>
+            <if test="deptCode != null">#{deptCode},</if>
+            <if test="deptPname != null">#{deptPname},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="email != null">#{email},</if>
+            <if test="planType != null">#{planType},</if>
+            <if test="maxHegiht != null">#{maxHegiht},</if>
+            <if test="planBeg != null">#{planBeg},</if>
+            <if test="planEnd != null">#{planEnd},</if>
+            <if test="txll != null">#{txll},</if>
+            <if test="taskType != null">#{taskType},</if>
+            <if test="optType != null">#{optType},</if>
+            <if test="flyType != null">#{flyType},</if>
+            <if test="remarkQjbj != null">#{remarkQjbj},</if>
+            <if test="remarkYjcz != null">#{remarkYjcz},</if>
+            <if test="remarkTsxq != null">#{remarkTsxq},</if>
+            <if test="remarkTdjn != null">#{remarkTdjn},</if>
+            <if test="remarkFxhx != null">#{remarkFxhx},</if>
+            <if test="remarkZhkz != null">#{remarkZhkz},</if>
+            <if test="remarkEcld != null">#{remarkEcld},</if>
+            <if test="remarkQtxx != null">#{remarkQtxx},</if>
+            <if test="six != null">#{six},</if>
+            <if test="spaces != null">#{spaces},</if>
+            <if test="files != null">#{files},</if>
+            <if test="applySts != null">#{applySts},</if>
+            <if test="applyDsc != null">#{applyDsc},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="hightMax != null">#{hightMax},</if>
+            <if test="hightMin != null">#{hightMin},</if>
+            <if test="lat != null">#{lat},</if>
+            <if test="lng != null">#{lng},</if>
+            <if test="militaryAreaName != null">#{militaryAreaName},</if>
+            <if test="militaryAreaId != null">#{militaryAreaId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="flightRule != null">#{flightRule},</if>
+            <if test="airspaceType != null">#{airspaceType},</if>
+            <if test="airspaceProp != null">#{airspaceProp},</if>
+            <if test="radLength != null">#{radLength},</if>
+            <if test="uuid != null">#{uuid},</if>
+            <if test="deptId != null">#{deptId},</if>
+        </trim>
+    </insert>
+
+
+    <update id="updateAirspaceApply" parameterType="com.djhk.uav.airspace.domain.AirspaceApply">
+        update airspace_apply
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="userType != null">user_type = #{userType},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="deptType != null">dept_type = #{deptType},</if>
+            <if test="deptCode != null">dept_code = #{deptCode},</if>
+            <if test="deptPname != null">dept_pname = #{deptPname},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="planType != null">plan_type = #{planType},</if>
+            <if test="maxHegiht != null">max_hegiht = #{maxHegiht},</if>
+            <if test="planBeg != null">plan_beg = #{planBeg},</if>
+            <if test="planEnd != null">plan_end = #{planEnd},</if>
+            <if test="txll != null">txll = #{txll},</if>
+            <if test="taskType != null">task_type = #{taskType},</if>
+            <if test="optType != null">opt_type = #{optType},</if>
+            <if test="flyType != null">fly_type = #{flyType},</if>
+            <if test="remarkQjbj != null">remark_qjbj = #{remarkQjbj},</if>
+            <if test="remarkYjcz != null">remark_yjcz = #{remarkYjcz},</if>
+            <if test="remarkTsxq != null">remark_tsxq = #{remarkTsxq},</if>
+            <if test="remarkTdjn != null">remark_tdjn = #{remarkTdjn},</if>
+            <if test="remarkFxhx != null">remark_fxhx = #{remarkFxhx},</if>
+            <if test="remarkZhkz != null">remark_zhkz = #{remarkZhkz},</if>
+            <if test="remarkEcld != null">remark_ecld = #{remarkEcld},</if>
+            <if test="remarkQtxx != null">remark_qtxx = #{remarkQtxx},</if>
+            <if test="six != null">six = #{six},</if>
+            <if test="spaces != null">spaces = #{spaces},</if>
+            <if test="files != null">files = #{files},</if>
+            <if test="applySts != null">apply_sts = #{applySts},</if>
+            <if test="applyDsc != null">apply_dsc = #{applyDsc},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="hightMax != null">hight_max = #{hightMax},</if>
+            <if test="hightMin != null">hight_min = #{hightMin},</if>
+            <if test="lat != null">lat = #{lat},</if>
+            <if test="lng != null">lng = #{lng},</if>
+            <if test="militaryAreaName != null">military_area_name = #{militaryAreaName},</if>
+            <if test="militaryAreaId != null">military_area_id = #{militaryAreaId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="flightRule != null">flight_rule = #{flightRule},</if>
+            <if test="airspaceType != null">airspace_type = #{airspaceType},</if>
+            <if test="airspaceProp != null">airspace_prop = #{airspaceProp},</if>
+            <if test="radLength != null">rad_length = #{radLength},</if>
+            <if test="uuid != null">uuid = #{uuid},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAirspaceApplyById" parameterType="Long">
+        DELETE FROM airspace_apply
+        WHERE id = #{id}
+    </delete>
+
+    <delete id="deleteAirspaceApplyByIds" parameterType="String">
+        delete from airspace_apply where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/djhk-system/src/main/resources/mapper/airspace/airspaceWaypointMapper.xml b/djhk-system/src/main/resources/mapper/airspace/airspaceWaypointMapper.xml
new file mode 100644
index 0000000..1b5fb11
--- /dev/null
+++ b/djhk-system/src/main/resources/mapper/airspace/airspaceWaypointMapper.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.djhk.uav.airspace.mapper.AirspaceWaypointMapper">
+
+    <resultMap type="com.djhk.uav.airspace.domain.AirspaceWaypoint" id="AirspaceWaypointResult">
+        <result column="id"         property="id"/>
+        <result column="airspace_apply_id" property="airspaceApplyId"/>
+        <result column="lng"  property="lng"/>
+        <result column="lat"  property="lat"/>
+        <result column="seq"  property="seq"/>
+    </resultMap>
+
+    <sql id="selectAirspaceWaypointVo">
+        select id,
+        airspace_apply_id,
+        lng,
+        lat,
+        seq
+        from
+        airspace_waypoint
+    </sql>
+
+    <select id="selectAirspaceWaypointList" parameterType="Long" resultMap="AirspaceWaypointResult">
+        <include refid="selectAirspaceWaypointVo"/>
+        where airspace_apply_id = #{airspaceApplyId}
+    </select>
+
+    <select id="selectAirspaceWaypointById" parameterType="Long" resultMap="AirspaceWaypointResult">
+        <include refid="selectAirspaceWaypointVo"/>
+        where airspace_apply_id = #{id}
+    </select>
+
+    <insert id="insertAirspaceWaypoint" parameterType="com.djhk.uav.airspace.domain.AirspaceWaypoint">
+        insert into airspace_waypoint
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="airspaceApplyId != null">airspace_apply_id, </if>
+            <if test="lat != null">lat,</if>
+            <if test="lng != null">lng,</if>
+            <if test="seq != null">seq,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="airspaceApplyId != null">#{airspaceApplyId},</if>
+            <if test="lat != null">#{lat},</if>
+            <if test="lng != null">#{lng},</if>
+            <if test="seq != null">#{seq},</if>
+        </trim>
+    </insert>
+
+
+    <delete id="deleteAirspaceWaypointById" parameterType="Long">
+        DELETE FROM airspace_waypoint
+        WHERE airspace_apply_id = #{id}
+    </delete>
+
+    <delete id="deleteAirspaceWaypointByIds" parameterType="String">
+        delete from airspace_waypoint where airspace_apply_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysCache.class b/djhk-system/target/classes/com/djhk/system/domain/SysCache.class
index 9828bc3..a20d450 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysCache.class and b/djhk-system/target/classes/com/djhk/system/domain/SysCache.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysConfig.class b/djhk-system/target/classes/com/djhk/system/domain/SysConfig.class
index 14c6b23..bfad5d2 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysConfig.class and b/djhk-system/target/classes/com/djhk/system/domain/SysConfig.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysLogininfor.class b/djhk-system/target/classes/com/djhk/system/domain/SysLogininfor.class
index efaee4d..ffea7ef 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysLogininfor.class and b/djhk-system/target/classes/com/djhk/system/domain/SysLogininfor.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysNotice.class b/djhk-system/target/classes/com/djhk/system/domain/SysNotice.class
index 3a80eb6..0fd13a4 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysNotice.class and b/djhk-system/target/classes/com/djhk/system/domain/SysNotice.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysOperLog.class b/djhk-system/target/classes/com/djhk/system/domain/SysOperLog.class
index 0846502..a62e394 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysOperLog.class and b/djhk-system/target/classes/com/djhk/system/domain/SysOperLog.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysPost.class b/djhk-system/target/classes/com/djhk/system/domain/SysPost.class
index 053d8e2..7946037 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysPost.class and b/djhk-system/target/classes/com/djhk/system/domain/SysPost.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysRoleDept.class b/djhk-system/target/classes/com/djhk/system/domain/SysRoleDept.class
index 8e55611..b9589ab 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysRoleDept.class and b/djhk-system/target/classes/com/djhk/system/domain/SysRoleDept.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysRoleMenu.class b/djhk-system/target/classes/com/djhk/system/domain/SysRoleMenu.class
index 9914a28..9a901da 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysRoleMenu.class and b/djhk-system/target/classes/com/djhk/system/domain/SysRoleMenu.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysUserOnline.class b/djhk-system/target/classes/com/djhk/system/domain/SysUserOnline.class
index 5b860bd..b488244 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysUserOnline.class and b/djhk-system/target/classes/com/djhk/system/domain/SysUserOnline.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysUserPost.class b/djhk-system/target/classes/com/djhk/system/domain/SysUserPost.class
index 1328413..f5fe1bd 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysUserPost.class and b/djhk-system/target/classes/com/djhk/system/domain/SysUserPost.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/SysUserRole.class b/djhk-system/target/classes/com/djhk/system/domain/SysUserRole.class
index 9f2e816..fc4e0a2 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/SysUserRole.class and b/djhk-system/target/classes/com/djhk/system/domain/SysUserRole.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/vo/MetaVo.class b/djhk-system/target/classes/com/djhk/system/domain/vo/MetaVo.class
index b743eb4..e5dfb72 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/vo/MetaVo.class and b/djhk-system/target/classes/com/djhk/system/domain/vo/MetaVo.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/domain/vo/RouterVo.class b/djhk-system/target/classes/com/djhk/system/domain/vo/RouterVo.class
index d3e6112..ac00b5f 100644
Binary files a/djhk-system/target/classes/com/djhk/system/domain/vo/RouterVo.class and b/djhk-system/target/classes/com/djhk/system/domain/vo/RouterVo.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysConfigMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysConfigMapper.class
index 131946c..22e8a63 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysConfigMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysConfigMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysDeptMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysDeptMapper.class
index db7df9b..313d420 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysDeptMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysDeptMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysDictDataMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysDictDataMapper.class
index ef26aa2..01ed3d3 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysDictDataMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysDictDataMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysDictTypeMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysDictTypeMapper.class
index 5008382..8600433 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysDictTypeMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysDictTypeMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysLogininforMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysLogininforMapper.class
index a6c61be..81d8bd6 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysLogininforMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysLogininforMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysMenuMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysMenuMapper.class
index b6dd9d1..b20b308 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysMenuMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysMenuMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysNoticeMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysNoticeMapper.class
index aa69d93..83f4932 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysNoticeMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysNoticeMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysOperLogMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysOperLogMapper.class
index ae51c60..c87a834 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysOperLogMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysOperLogMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysPostMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysPostMapper.class
index d4351ae..e848fa9 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysPostMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysPostMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysRoleDeptMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysRoleDeptMapper.class
index 34a36f5..de010ce 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysRoleDeptMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysRoleDeptMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMapper.class
index edfbc76..49d72d5 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMenuMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMenuMapper.class
index 79b4da7..93df5ad 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMenuMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysRoleMenuMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysUserMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysUserMapper.class
index 04ce617..a585a1d 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysUserMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysUserMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysUserPostMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysUserPostMapper.class
index 4e09b1c..8c6425b 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysUserPostMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysUserPostMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/mapper/SysUserRoleMapper.class b/djhk-system/target/classes/com/djhk/system/mapper/SysUserRoleMapper.class
index 9249dc3..e0e5d95 100644
Binary files a/djhk-system/target/classes/com/djhk/system/mapper/SysUserRoleMapper.class and b/djhk-system/target/classes/com/djhk/system/mapper/SysUserRoleMapper.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysConfigService.class b/djhk-system/target/classes/com/djhk/system/service/ISysConfigService.class
index 1fd0cc2..4740347 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysConfigService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysConfigService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysDeptService.class b/djhk-system/target/classes/com/djhk/system/service/ISysDeptService.class
index ce5183c..99ceca9 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysDeptService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysDeptService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysDictDataService.class b/djhk-system/target/classes/com/djhk/system/service/ISysDictDataService.class
index deab891..709bcdb 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysDictDataService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysDictDataService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysDictTypeService.class b/djhk-system/target/classes/com/djhk/system/service/ISysDictTypeService.class
index 0ab202c..40a631e 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysDictTypeService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysDictTypeService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysLogininforService.class b/djhk-system/target/classes/com/djhk/system/service/ISysLogininforService.class
index 19878fc..c557d8a 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysLogininforService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysLogininforService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysMenuService.class b/djhk-system/target/classes/com/djhk/system/service/ISysMenuService.class
index f5b23fc..f393702 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysMenuService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysMenuService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysNoticeService.class b/djhk-system/target/classes/com/djhk/system/service/ISysNoticeService.class
index aeab672..75bb8cd 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysNoticeService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysNoticeService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysOperLogService.class b/djhk-system/target/classes/com/djhk/system/service/ISysOperLogService.class
index 1a5ddaf..c945dfb 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysOperLogService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysOperLogService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysPostService.class b/djhk-system/target/classes/com/djhk/system/service/ISysPostService.class
index d338806..6aea87a 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysPostService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysPostService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysRoleService.class b/djhk-system/target/classes/com/djhk/system/service/ISysRoleService.class
index 3810927..f03ed2b 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysRoleService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysRoleService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysUserOnlineService.class b/djhk-system/target/classes/com/djhk/system/service/ISysUserOnlineService.class
index 3a0274e..82778b9 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysUserOnlineService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysUserOnlineService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/ISysUserService.class b/djhk-system/target/classes/com/djhk/system/service/ISysUserService.class
index 6c19066..dc81802 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/ISysUserService.class and b/djhk-system/target/classes/com/djhk/system/service/ISysUserService.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysConfigServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysConfigServiceImpl.class
index 3d893be..d5c8412 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysConfigServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysConfigServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysDeptServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysDeptServiceImpl.class
index 891e812..fc2e565 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysDeptServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysDeptServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysDictDataServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysDictDataServiceImpl.class
index 986c028..27d90ad 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysDictDataServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysDictDataServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysDictTypeServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysDictTypeServiceImpl.class
index 7254a5a..b6cefeb 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysDictTypeServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysDictTypeServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysLogininforServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysLogininforServiceImpl.class
index 3070b4e..ae01716 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysLogininforServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysLogininforServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysMenuServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysMenuServiceImpl.class
index 71e4045..cd20837 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysMenuServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysMenuServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysNoticeServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysNoticeServiceImpl.class
index 83b420e..feaa844 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysNoticeServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysNoticeServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysOperLogServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysOperLogServiceImpl.class
index 56a8364..4a55c45 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysOperLogServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysOperLogServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysPostServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysPostServiceImpl.class
index 85b2d52..5e1a0b8 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysPostServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysPostServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysRoleServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysRoleServiceImpl.class
index e1d5e3e..208392a 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysRoleServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysRoleServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysUserOnlineServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysUserOnlineServiceImpl.class
index c35b537..cc4baca 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysUserOnlineServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysUserOnlineServiceImpl.class differ
diff --git a/djhk-system/target/classes/com/djhk/system/service/impl/SysUserServiceImpl.class b/djhk-system/target/classes/com/djhk/system/service/impl/SysUserServiceImpl.class
index e57a419..043acb4 100644
Binary files a/djhk-system/target/classes/com/djhk/system/service/impl/SysUserServiceImpl.class and b/djhk-system/target/classes/com/djhk/system/service/impl/SysUserServiceImpl.class differ
diff --git a/pom.xml b/pom.xml
index f4c57eb..fbbe552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@
         <djhk.version>3.6.0</djhk.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+<!--        <java.version>1.8</java.version>-->
+        <java.version>11</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <spring-boot.version>2.5.15</spring-boot.version>
         <druid.version>1.2.23</druid.version>
@@ -36,12 +37,32 @@
         <logback.version>1.2.13</logback.version>
         <spring-security.version>5.7.14</spring-security.version>
         <spring-framework.version>5.3.39</spring-framework.version>
+        <lombok.version>1.18.24</lombok.version>
     </properties>
 
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
 
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-freemarker</artifactId>
+                <version>2.7.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>3.4.2</version>
+            </dependency>
+
+
             <!-- 覆盖SpringFramework的依赖配置-->
             <dependency>
                 <groupId>org.springframework</groupId>
@@ -229,6 +250,7 @@
         <module>djhk-quartz</module>
         <module>djhk-generator</module>
         <module>djhk-common</module>
+        <module>djhk-uav</module>
     </modules>
     <packaging>pom</packaging>