From ba1180661b21be6943a20d6943f536adc050ff8a Mon Sep 17 00:00:00 2001 From: tanghaihao <850814414@qq.com> Date: Mon, 7 Aug 2023 11:05:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=B8=80=E4=B8=AA=E6=B2=A1?= =?UTF-8?q?=E7=94=A8=E5=88=B0=E7=9A=84getEmInfoTreeByEmCode=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/equipment/feign/IEmInfoClient.java | 4 ---- .../java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java | 4 ---- .../main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java | 10 ---------- .../java/com/hnac/hzims/equipment/service/IEmInfoService.java | 2 -- .../hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java | 6 ------ 5 files changed, 26 deletions(-) diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java index 4d5d095..7c99354 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java @@ -76,7 +76,6 @@ public interface IEmInfoClient { String GET_EM_INFO_BY_DEPT = API_PREFIX + "/getEmInfoByDept"; String GET_EM_INFO_BY_NAME = API_PREFIX + "/getEmInfoByName"; String GET_EM_INFO_BY_EM_CODE = API_PREFIX + "/getEmInfoByEmCode"; - String GET_EM_INFO_TREE_BY_EM_CODE = API_PREFIX + "/getEmInfoTreeByEmCode"; String UPDATE_BY_EM_CODE = API_PREFIX + "/updateByEmCode"; String UPDATE_BATCH_EM_STATE = API_PREFIX + "/updateBachEmState"; String GET_CHILDREN_BY_EM_CODE = API_PREFIX + "/getChildrenByEmCode"; @@ -115,9 +114,6 @@ public interface IEmInfoClient { @GetMapping(GET_EM_INFO_BY_EM_CODES) R> getEmInfoByEmCodes(@RequestParam("emCodes") List emCodes); - @GetMapping(GET_EM_INFO_TREE_BY_EM_CODE) - R> getEmInfoTreeByEmCode(@RequestParam("emCode") String emCode); - @PostMapping(GET_EM_INFO_UNIT_COUNT_BY_DEPT) R getEmInfoUnitCountByDept(@RequestParam("list") List list); diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java index e8b0b95..b9aa407 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java @@ -54,10 +54,6 @@ public class IEmInfoClientBack implements IEmInfoClient { return R.data(new ArrayList<>()); } - @Override - public R> getEmInfoTreeByEmCode(String emCode) { - return R.data(new ArrayList<>()); - } @Override public R getEmInfoUnitCountByDept(List depts) { diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java index dd24111..cb2ac6e 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmInfoClient.java @@ -144,14 +144,4 @@ public class EmInfoClient implements IEmInfoClient { return R.data(service.list(wrapper).stream().map(EmInfoEntity::getNumber).distinct().collect(Collectors.toList())); } - /** - * - * @param emCode - * @return - */ - @GetMapping(value = GET_EM_INFO_TREE_BY_EM_CODE) - @Override - public R> getEmInfoTreeByEmCode(String emCode) { - return R.data(service.getEmInfoTreeByEmCode(emCode)); - } } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java index fe9aa95..b607902 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/IEmInfoService.java @@ -60,8 +60,6 @@ public interface IEmInfoService extends BaseService { EmInfoEntity getEmInfoByEmCode(String emCode); - List getEmInfoTreeByEmCode(String emCode); - void loadEmInfo(); List getEmInfoAndParamRedis(); diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java index 0624b01..25cd987 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java @@ -311,12 +311,6 @@ public class EmInfoServiceImpl extends BaseServiceImpl getEmInfoTreeByEmCode(String emCode) { - - return null; - } - /** * 把设备信息及装机容量、ct、pt从Redis 取出来 */