瀏覽代碼

feature(app目录结构修改): app目录结构修改

app目录结构修改
mazq 4 年之前
父節點
當前提交
29ac47a4f7
共有 35 個文件被更改,包括 66 次插入71 次删除
  1. 2 2
      dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataClaFacade.java
  2. 1 1
      dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataLevelFacade.java
  3. 1 1
      dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataSecFacade.java
  4. 2 2
      dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IFieldClaFacade.java
  5. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataClaAcceptDTO.java
  6. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataClaDTO.java
  7. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataLevelDTO.java
  8. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataSecDTO.java
  9. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/ExcelDataLevel.java
  10. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/ExcelDataSec.java
  11. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/FieldClaAcceptDTO.java
  12. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/FieldClaDTO.java
  13. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataCla.java
  14. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataLevel.java
  15. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataSec.java
  16. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/FieldCla.java
  17. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/sub/DataClaTypeEnum.java
  18. 1 1
      dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/sub/FieldClaTypeEnum.java
  19. 8 8
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java
  20. 3 3
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/DataClaFacade.java
  21. 2 2
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/DataLevelFacade.java
  22. 2 2
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/DataSecFacade.java
  23. 3 3
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/FieldClaFacade.java
  24. 1 1
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/DataClaMapper.java
  25. 1 1
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/DataLevelMapper.java
  26. 1 1
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/DataSecMapper.java
  27. 1 1
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/FieldClaMapper.java
  28. 3 3
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IDataClaService.java
  29. 2 2
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IDataLevelService.java
  30. 2 2
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IDataSecService.java
  31. 3 3
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IFieldClaService.java
  32. 4 6
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataClaServiceImpl.java
  33. 3 3
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataLevelServiceImpl.java
  34. 3 6
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataSecServiceImpl.java
  35. 4 4
      dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/FieldClaServiceImpl.java

+ 2 - 2
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataClaFacade.java

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.sub.dto.DataClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.DataClaDTO;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.data.domain.Page;

+ 1 - 1
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataLevelFacade.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.sub.dto.DataLevelDTO;
+import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;

+ 1 - 1
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IDataSecFacade.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.sub.dto.DataSecDTO;
+import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;

+ 2 - 2
dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/sub/IFieldClaFacade.java

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.data.domain.Page;

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/DataClaAcceptDTO.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataClaAcceptDTO.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/DataClaDTO.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataClaDTO.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/DataLevelDTO.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataLevelDTO.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/DataSecDTO.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/DataSecDTO.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/ExcelDataLevel.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/ExcelDataLevel.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/ExcelDataSec.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/ExcelDataSec.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/FieldClaAcceptDTO.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/FieldClaAcceptDTO.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/FieldClaDTO.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/dto/sub/FieldClaDTO.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.dto;
+package com.dragoninfo.dcuc.app.dto.sub;
 
 import lombok.Data;
 

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/DataCla.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataCla.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.entity;
+package com.dragoninfo.dcuc.app.entity.sub;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.dragonsoft.duceap.base.annotations.audit.DeletedBy;

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/DataLevel.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataLevel.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.entity;
+package com.dragoninfo.dcuc.app.entity.sub;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.dragonsoft.duceap.base.annotations.audit.DeletedBy;

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/DataSec.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/DataSec.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.entity;
+package com.dragoninfo.dcuc.app.entity.sub;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.dragonsoft.duceap.base.annotations.audit.DeletedBy;

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/FieldCla.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/entity/sub/FieldCla.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.entity;
+package com.dragoninfo.dcuc.app.entity.sub;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.dragonsoft.duceap.base.annotations.audit.DeletedBy;

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/enumresources/DataClaTypeEnum.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/sub/DataClaTypeEnum.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.enumresources;
+package com.dragoninfo.dcuc.app.enumresources.sub;
 
 /**
  * 数据资源分类枚举类

+ 1 - 1
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/enumresources/FieldClaTypeEnum.java → dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/sub/FieldClaTypeEnum.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.app.sub.enumresources;
+package com.dragoninfo.dcuc.app.enumresources.sub;
 
 /**
  * 字段分类枚举类

+ 8 - 8
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -4,14 +4,14 @@ import com.dragoninfo.dcuc.app.dto.dataresource.ChildResourceClassify;
 import com.dragoninfo.dcuc.app.dto.dataresource.ResourceClassify;
 import com.dragoninfo.dcuc.app.enumresources.DataResourceEnum;
 import com.dragoninfo.dcuc.app.service.IDataResourceService;
-import com.dragoninfo.dcuc.app.sub.dto.DataClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataCla;
-import com.dragoninfo.dcuc.app.sub.entity.DataLevel;
-import com.dragoninfo.dcuc.app.sub.entity.DataSec;
-import com.dragoninfo.dcuc.app.sub.entity.FieldCla;
-import com.dragoninfo.dcuc.app.sub.enumresources.DataClaTypeEnum;
-import com.dragoninfo.dcuc.app.sub.enumresources.FieldClaTypeEnum;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataCla;
+import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
+import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
+import com.dragoninfo.dcuc.app.enumresources.sub.DataClaTypeEnum;
+import com.dragoninfo.dcuc.app.enumresources.sub.FieldClaTypeEnum;
 import com.dragoninfo.dcuc.app.sub.service.IDataClaService;
 import com.dragoninfo.dcuc.app.sub.service.IDataLevelService;
 import com.dragoninfo.dcuc.app.sub.service.IDataSecService;

+ 3 - 3
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/DataClaFacade.java

@@ -1,9 +1,9 @@
 package com.dragoninfo.dcuc.app.sub.facade;
 
 import com.dragoninfo.dcuc.app.facade.sub.IDataClaFacade;
-import com.dragoninfo.dcuc.app.sub.dto.DataClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.DataClaDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataCla;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataCla;
 import com.dragoninfo.dcuc.app.sub.service.IDataClaService;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.beans.BeanUtils;

+ 2 - 2
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/DataLevelFacade.java

@@ -1,8 +1,8 @@
 package com.dragoninfo.dcuc.app.sub.facade;
 
 import com.dragoninfo.dcuc.app.facade.sub.IDataLevelFacade;
-import com.dragoninfo.dcuc.app.sub.dto.DataLevelDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataLevel;
+import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
 import com.dragoninfo.dcuc.app.sub.service.IDataLevelService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;

+ 2 - 2
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/DataSecFacade.java

@@ -1,8 +1,8 @@
 package com.dragoninfo.dcuc.app.sub.facade;
 
 import com.dragoninfo.dcuc.app.facade.sub.IDataSecFacade;
-import com.dragoninfo.dcuc.app.sub.dto.DataSecDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataSec;
 import com.dragoninfo.dcuc.app.sub.service.IDataSecService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;

+ 3 - 3
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/facade/FieldClaFacade.java

@@ -1,9 +1,9 @@
 package com.dragoninfo.dcuc.app.sub.facade;
 
 import com.dragoninfo.dcuc.app.facade.sub.IFieldClaFacade;
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaDTO;
-import com.dragoninfo.dcuc.app.sub.entity.FieldCla;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragoninfo.dcuc.app.sub.service.IFieldClaService;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.beans.BeanUtils;

+ 1 - 1
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/DataClaMapper.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.sub.mapper;
 
-import com.dragoninfo.dcuc.app.sub.entity.DataCla;
+import com.dragoninfo.dcuc.app.entity.sub.DataCla;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 
 /**

+ 1 - 1
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/DataLevelMapper.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.sub.mapper;
 
-import com.dragoninfo.dcuc.app.sub.entity.DataLevel;
+import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 
 /**

+ 1 - 1
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/DataSecMapper.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.sub.mapper;
 
-import com.dragoninfo.dcuc.app.sub.entity.DataSec;
+import com.dragoninfo.dcuc.app.entity.sub.DataSec;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 
 /**

+ 1 - 1
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/mapper/FieldClaMapper.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.sub.mapper;
 
-import com.dragoninfo.dcuc.app.sub.entity.FieldCla;
+import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 
 /**

+ 3 - 3
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IDataClaService.java

@@ -1,8 +1,8 @@
 package com.dragoninfo.dcuc.app.sub.service;
 
-import com.dragoninfo.dcuc.app.sub.dto.DataClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.DataClaDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataCla;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataCla;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.data.domain.Page;

+ 2 - 2
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IDataLevelService.java

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.sub.service;
 
-import com.dragoninfo.dcuc.app.sub.dto.DataLevelDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataLevel;
+import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;

+ 2 - 2
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IDataSecService.java

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.sub.service;
 
-import com.dragoninfo.dcuc.app.sub.dto.DataSecDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataSec;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;

+ 3 - 3
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/IFieldClaService.java

@@ -1,8 +1,8 @@
 package com.dragoninfo.dcuc.app.sub.service;
 
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaDTO;
-import com.dragoninfo.dcuc.app.sub.entity.FieldCla;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.data.domain.Page;

+ 4 - 6
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataClaServiceImpl.java

@@ -5,15 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dragoninfo.dcuc.app.cons.CommonCons;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
-import com.dragoninfo.dcuc.app.sub.dto.DataClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.DataClaDTO;
-import com.dragoninfo.dcuc.app.sub.entity.DataCla;
-import com.dragoninfo.dcuc.app.sub.entity.FieldCla;
-import com.dragoninfo.dcuc.app.sub.enumresources.DataClaTypeEnum;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.DataClaDTO;
+import com.dragoninfo.dcuc.app.entity.sub.DataCla;
+import com.dragoninfo.dcuc.app.enumresources.sub.DataClaTypeEnum;
 import com.dragoninfo.dcuc.app.sub.mapper.DataClaMapper;
 import com.dragoninfo.dcuc.app.sub.service.IDataClaService;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
-import com.dragoninfo.dcuc.auth.auth.enumresources.AuthDataTypeEnum;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;

+ 3 - 3
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataLevelServiceImpl.java

@@ -2,9 +2,9 @@ package com.dragoninfo.dcuc.app.sub.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
-import com.dragoninfo.dcuc.app.sub.dto.DataLevelDTO;
-import com.dragoninfo.dcuc.app.sub.dto.ExcelDataLevel;
-import com.dragoninfo.dcuc.app.sub.entity.DataLevel;
+import com.dragoninfo.dcuc.app.dto.sub.DataLevelDTO;
+import com.dragoninfo.dcuc.app.dto.sub.ExcelDataLevel;
+import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
 import com.dragoninfo.dcuc.app.sub.mapper.DataLevelMapper;
 import com.dragoninfo.dcuc.app.sub.service.IDataLevelService;
 import com.dragoninfo.dcuc.app.util.ImportUtil;

+ 3 - 6
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataSecServiceImpl.java

@@ -1,13 +1,10 @@
 package com.dragoninfo.dcuc.app.sub.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
-import com.dragoninfo.dcuc.app.sub.dto.DataSecDTO;
-import com.dragoninfo.dcuc.app.sub.dto.ExcelDataLevel;
-import com.dragoninfo.dcuc.app.sub.dto.ExcelDataSec;
-import com.dragoninfo.dcuc.app.sub.entity.DataLevel;
-import com.dragoninfo.dcuc.app.sub.entity.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
+import com.dragoninfo.dcuc.app.dto.sub.ExcelDataSec;
+import com.dragoninfo.dcuc.app.entity.sub.DataSec;
 import com.dragoninfo.dcuc.app.sub.mapper.DataSecMapper;
 import com.dragoninfo.dcuc.app.sub.service.IDataSecService;
 import com.dragoninfo.dcuc.app.util.ImportUtil;

+ 4 - 4
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/FieldClaServiceImpl.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dragoninfo.dcuc.app.cons.CommonCons;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaAcceptDTO;
-import com.dragoninfo.dcuc.app.sub.dto.FieldClaDTO;
-import com.dragoninfo.dcuc.app.sub.entity.FieldCla;
-import com.dragoninfo.dcuc.app.sub.enumresources.FieldClaTypeEnum;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
+import com.dragoninfo.dcuc.app.enumresources.sub.FieldClaTypeEnum;
 import com.dragoninfo.dcuc.app.sub.mapper.FieldClaMapper;
 import com.dragoninfo.dcuc.app.sub.service.IFieldClaService;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;