From 77bf38e96b92a9c002111474a7c20fce72eb8571 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 15 Sep 2022 10:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../power/feign/PliPowerFeignClient.java | 24 ------------------- .../impl/PliPowerFeignClientFallBack.java | 24 ------------------- .../PliPowerFeignClientFallBackFactory.java | 20 ---------------- .../impl/HikCommunityInfoServiceImpl.java | 3 +-- .../impl/HikDeviceInfoServiceImpl.java | 3 +-- .../modules/{ => hik}/utils/HkDeviceUtil.java | 2 +- .../impl/RentContractInfoServiceImpl.java | 2 +- 7 files changed, 4 insertions(+), 74 deletions(-) delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java delete mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java rename epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/{ => hik}/utils/HkDeviceUtil.java (99%) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java deleted file mode 100644 index f75c5fc..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.epmet.plugin.power.feign; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.plugin.power.feign.impl.PliPowerFeignClientFallBackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * desc: 数据统计 对外feign client - * - * @return: - * @date: 2020/6/22 17:39 - * @author: jianjun liu - */ -@FeignClient(name = ServiceConstant.PLI_POWER_SERVER, fallbackFactory = PliPowerFeignClientFallBackFactory.class) -public interface PliPowerFeignClient { - - @PostMapping("/pli/power/visitVisitor/visitorlogout") - Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO); - -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java deleted file mode 100644 index 63986ce..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.epmet.plugin.power.feign.impl; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.plugin.power.feign.PliPowerFeignClient; - -/** - * desc: - * - * @return: - * @date: 2020/6/22 9:38 - * @author: jianjun liu - * email:liujianjun@git.elinkit.com.cn - */ -public class PliPowerFeignClientFallBack implements PliPowerFeignClient { - - @Override - public Result visitorLogout(VisitorLogoutFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "visitorLogout",formDTO); - } - -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java deleted file mode 100644 index 99e35fa..0000000 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBackFactory.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.epmet.plugin.power.feign.impl; - -import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.plugin.power.feign.PliPowerFeignClient; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -@Component -@Slf4j -public class PliPowerFeignClientFallBackFactory implements FallbackFactory { - - private PliPowerFeignClientFallBack fallback = new PliPowerFeignClientFallBack(); - - @Override - public PliPowerFeignClient create(Throwable cause) { - log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); - return fallback; - } -} diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java index d026706..73d1117 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikCommunityInfoServiceImpl.java @@ -19,8 +19,7 @@ import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO; import com.epmet.plugin.power.modules.hik.entity.HikCommunityInfoEntity; import com.epmet.plugin.power.modules.hik.redis.HikCommunityInfoRedis; import com.epmet.plugin.power.modules.hik.service.HikCommunityInfoService; -import com.epmet.plugin.power.modules.utils.HkDeviceUtil; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java index 5933489..550c7ff 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/service/impl/HikDeviceInfoServiceImpl.java @@ -18,11 +18,10 @@ import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO; import com.epmet.plugin.power.modules.hik.dao.HikCommunityInfoDao; import com.epmet.plugin.power.modules.hik.dao.HikDeviceInfoDao; import com.epmet.plugin.power.dto.hik.HikDeviceInfoDTO; -import com.epmet.plugin.power.modules.hik.entity.HikCommunityInfoEntity; import com.epmet.plugin.power.modules.hik.entity.HikDeviceInfoEntity; import com.epmet.plugin.power.modules.hik.redis.HikDeviceInfoRedis; import com.epmet.plugin.power.modules.hik.service.HikDeviceInfoService; -import com.epmet.plugin.power.modules.utils.HkDeviceUtil; +import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/HkDeviceUtil.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/utils/HkDeviceUtil.java similarity index 99% rename from epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/HkDeviceUtil.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/utils/HkDeviceUtil.java index fd9689b..9c2b572 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/HkDeviceUtil.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/hik/utils/HkDeviceUtil.java @@ -1,4 +1,4 @@ -package com.epmet.plugin.power.modules.utils; +package com.epmet.plugin.power.modules.hik.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index b8f74a7..3c28c8b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -39,7 +39,7 @@ import com.epmet.plugin.power.modules.rent.redis.RentContractInfoRedis; import com.epmet.plugin.power.modules.rent.service.RentContractFileService; import com.epmet.plugin.power.modules.rent.service.RentContractInfoService; import com.epmet.plugin.power.modules.rent.service.RentTenantInfoService; -import com.epmet.plugin.power.modules.utils.HkDeviceUtil; +import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;