重构代码

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/AsyncService.java → tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/flightdata/AsyncService.java

@@ -1,4 +1,4 @@
-package com.tuoheng.admin.service;
+package com.tuoheng.admin.service.flightdata;
 
 import java.util.List;
 
@@ -9,6 +9,7 @@ public interface AsyncService {
 
     /**
      * 飞行数据批量入库
+     *
      * @param list
      */
     void flightDataSaveBatch(List list);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/AsyncServiceImpl.java → tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/flightdata/AsyncServiceImpl.java

@@ -1,7 +1,5 @@
-package com.tuoheng.admin.service.impl;
+package com.tuoheng.admin.service.flightdata;
 
-import com.tuoheng.admin.service.AsyncService;
-import com.tuoheng.admin.service.flightdata.IFlightDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/upload/UploadFlightUrlService.java

@@ -14,7 +14,7 @@ import com.tuoheng.admin.mapper.FlightDataMapper;
 import com.tuoheng.admin.mapper.InspectionFileMapper;
 import com.tuoheng.admin.mapper.InspectionMapper;
 import com.tuoheng.admin.request.inspection.UploadFlightUrlRequest;
-import com.tuoheng.admin.service.AsyncService;
+import com.tuoheng.admin.service.flightdata.AsyncService;
 import com.tuoheng.admin.service.business.IBusinessService;
 import com.tuoheng.admin.service.third.dsp.IDspService;
 import com.tuoheng.admin.utils.CurrentUserUtil;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/IRoleMenuService.java → tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/IRoleMenuService.java

@@ -1,4 +1,4 @@
-package com.tuoheng.admin.service;
+package com.tuoheng.admin.service.role;
 
 import com.tuoheng.admin.entity.RoleMenu;
 import com.tuoheng.common.core.common.IBaseService;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/OpRolePermissionService.java → tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/OpRolePermissionService.java

@@ -1,4 +1,4 @@
-package com.tuoheng.admin.service;
+package com.tuoheng.admin.service.role;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/OpRolePermissionServiceImpl.java → tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/OpRolePermissionServiceImpl.java

@@ -1,10 +1,10 @@
-package com.tuoheng.admin.service.impl;
+package com.tuoheng.admin.service.role;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.tuoheng.admin.entity.OpRolePermission;
 import com.tuoheng.admin.mapper.OpRolePermissionMapper;
-import com.tuoheng.admin.service.OpRolePermissionService;
+import com.tuoheng.admin.service.role.OpRolePermissionService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/RoleMenuServiceImpl.java → tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/RoleMenuServiceImpl.java

@@ -1,11 +1,10 @@
-package com.tuoheng.admin.service.impl;
+package com.tuoheng.admin.service.role;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.tuoheng.admin.entity.RoleMenu;
 import com.tuoheng.admin.mapper.RoleMenuMapper;
-import com.tuoheng.admin.service.IRoleMenuService;
-import com.tuoheng.common.core.common.BaseServiceImpl;
+import com.tuoheng.admin.service.role.IRoleMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/role/RoleServiceImpl.java

@@ -9,18 +9,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tuoheng.admin.dto.*;
 import com.tuoheng.admin.entity.*;
-import com.tuoheng.admin.enums.RoleEnum;
 import com.tuoheng.admin.enums.code.role.RoleDeleteEnum;
 import com.tuoheng.admin.mapper.*;
 import com.tuoheng.admin.query.RoleClientQuery;
 import com.tuoheng.admin.query.RoleQuery;
-import com.tuoheng.admin.service.IRoleMenuService;
-import com.tuoheng.admin.service.OpRolePermissionService;
 import com.tuoheng.admin.service.menu.IMenuService;
 import com.tuoheng.admin.utils.CurrentUserUtil;
 import com.tuoheng.admin.vo.RoleListVo;
-import com.tuoheng.common.core.common.BaseEntity;
-import com.tuoheng.common.core.common.BaseServiceImpl;
 import com.tuoheng.common.core.utils.DateUtils;
 import com.tuoheng.common.core.utils.JsonResult;
 import com.tuoheng.common.core.utils.StringUtils;
@@ -31,7 +26,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 /**