From 644dccd78c0d0d31bbd97bc5d813ffd66397467e Mon Sep 17 00:00:00 2001 From: YUJT Date: Thu, 15 Jul 2021 17:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9analysispc=E5=8C=85=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-admin/pom.xml | 4 ++-- .../java/com/elink/esua/epdc/feign/AnalysisFeignClient.java | 2 +- .../epdc/feign/fallback/AnalysisFeignClientFallback.java | 2 +- .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java | 6 +++--- .../epdc/service/impl/SysEpmetUserRelationServiceImpl.java | 4 ++-- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/epdc-cloud-admin/pom.xml b/epdc-cloud-admin/pom.xml index 780b152..a014a21 100644 --- a/epdc-cloud-admin/pom.xml +++ b/epdc-cloud-admin/pom.xml @@ -99,8 +99,8 @@ com.esua.epdc.yushan - epdc-analysis-client - 1.0.0 + epdc-cloud-analysis-client + ${epdc-cloud-client.version} diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 8710739..1c9c1bb 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/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; diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 5c4b070..10ececa 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/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; diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 103129b..08d59e1 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/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; diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysEpmetUserRelationServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysEpmetUserRelationServiceImpl.java index 81a6e03..e4c2efe 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysEpmetUserRelationServiceImpl.java +++ b/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; diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 982b1ff..acc2f7b 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 982b1ff01e69e7cb48180e3d68c94664605ae73e +Subproject commit acc2f7b6befe41e277de108d7a34b34d8b865371 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 5b077ff..6df155e 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 5b077ffda98e46ce47e9c5540dabbc50f092968d +Subproject commit 6df155e032d4e8fb218da25f1584f0202ea90547