修改analysispc包结构

epdc-cloud-admin/pom.xml

@@ -99,8 +99,8 @@
         </dependency>
         <dependency>
             <groupId>com.esua.epdc.yushan</groupId>
-            <artifactId>epdc-analysis-client</artifactId>
-            <version>1.0.0</version>
+            <artifactId>epdc-cloud-analysis-client</artifactId>
+            <version>${epdc-cloud-client.version}</version>
         </dependency>
     </dependencies>
 

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -2,7 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.admin.*;
+import com.elink.esua.epdc.dto.analysis.pc.admin.*;
 import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
 import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -3,7 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.admin.*;
+import com.elink.esua.epdc.dto.analysis.pc.admin.*;
 import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.springframework.stereotype.Component;

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -31,9 +31,9 @@ import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.constant.RoleTypeKeyConstant;
 import com.elink.esua.epdc.dao.SysDeptDao;
 import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeFormDTO;
-import com.elink.esua.epdc.dto.admin.DeptAddAreaCodeResultDTO;
-import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptAddAreaCodeResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.DeptCodeFormDTO;
 import com.elink.esua.epdc.dto.epdc.DeptCodeOption;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO;

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysEpmetUserRelationServiceImpl.java

@@ -26,8 +26,8 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SysEpmetUserRelationDao;
 import com.elink.esua.epdc.dto.SysEpmetUserRelationDTO;
-import com.elink.esua.epdc.dto.admin.SysEpmetUserFormDTO;
-import com.elink.esua.epdc.dto.admin.SysEpmetUserResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.SysEpmetUserFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.admin.SysEpmetUserResultDTO;
 import com.elink.esua.epdc.entity.SysEpmetUserRelationEntity;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.SysEpmetUserRelationService;

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 982b1ff01e69e7cb48180e3d68c94664605ae73e
+Subproject commit acc2f7b6befe41e277de108d7a34b34d8b865371

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 5b077ffda98e46ce47e9c5540dabbc50f092968d
+Subproject commit 6df155e032d4e8fb218da25f1584f0202ea90547