diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java index f71751c..262d082 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java @@ -4,6 +4,8 @@ import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory; import com.njcn.csdevice.pojo.po.CsLinePO; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -18,5 +20,8 @@ public interface CsLineFeignClient { @PostMapping("/queryLineById") - public HttpResult> queryLineById(@RequestParam("ids") List ids ); + HttpResult> queryLineById(@RequestParam("ids") List ids ); + + @PostMapping("/queryLineByDevId") + HttpResult> queryLineByDevId(@RequestParam("id") String id); } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java index 42b8c15..44421ba 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java @@ -33,6 +33,11 @@ public class CsLineClientFallbackFactory implements FallbackFactory> queryLineByDevId(String id) { + log.error("{}异常,降级处理,异常为:{}","查询监测点详情异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); } }; } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java index 40cb041..33fac9e 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java @@ -45,4 +45,14 @@ public class CslineController extends BaseController { List csLinePOS = csLinePOService.listByIds(ids); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csLinePOS, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryLineByDevId") + @ApiOperation("项目查询通过id获取") + @ApiImplicitParam(name = "id", value = "项目id集合", required = true) + public HttpResult> queryLineByDevId(@RequestParam String id){ + String methodDescribe = getMethodDescribe("queryLineByDevId"); + List csLinePOS = csLinePOService.queryByDevId(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, csLinePOS, methodDescribe); + } } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java index 53d2c01..5d44cee 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java @@ -3,6 +3,7 @@ package com.njcn.harmonic.service.impl; import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.constant.DataParam; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.po.CsLinePO; @@ -14,7 +15,10 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import pojo.param.ThdDataQueryParm; import pojo.vo.ThdDataVO; - +import com.njcn.influx.pojo.po.HarmonicRatioData; +import com.njcn.influx.pojo.po.PowerQualityData; +import com.njcn.influx.service.HaronicRatioService; +import com.njcn.influx.service.PowerQualityService; import java.time.ZoneId; import java.util.ArrayList; import java.util.List; @@ -33,14 +37,14 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class StableDataServiceImpl implements StableDataService { - private final CsLinePOService csLinePOService; + private final CsLineFeignClient csLineFeignClient; private final PowerQualityService powerQualityService; - private final HarmonicRatioService harmonicRatioService; + private final HaronicRatioService harmonicRatioService; @Override public List queryThdData(String devId, String statisticalName) { List thdDataVOList = new ArrayList<>(); - List csLinePOList = csLinePOService.queryByDevId(devId); + List csLinePOList = csLineFeignClient.queryLineByDevId(devId).getData(); Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); List firstPowerQuality = powerQualityService.getFirstPowerQuality(collect, statisticalName); @@ -74,7 +78,7 @@ public class StableDataServiceImpl implements StableDataService { @Override public List queryThdDataByTime(ThdDataQueryParm thdDataQueryParm) { List thdDataVOList = new ArrayList<>(); - List csLinePOList = csLinePOService.queryByDevId(thdDataQueryParm.getDevId()); + List csLinePOList = csLineFeignClient.queryLineByDevId(thdDataQueryParm.getDevId()).getData(); Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); List firstPowerQuality = powerQualityService.getPowerQuality(collect, thdDataQueryParm.getStatisticalName(), thdDataQueryParm.getStartTime(), thdDataQueryParm.getEndTime()); @@ -108,10 +112,10 @@ public class StableDataServiceImpl implements StableDataService { @Override public List queryFisrtThdContent(String devId, String statisticalName) { List thdDataVOList = new ArrayList<>(); - List csLinePOList = csLinePOService.queryByDevId(devId); + List csLinePOList = csLineFeignClient.queryLineByDevId(devId).getData(); Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); - List harmonicRatioList = haronicRatioService.getFirstHaronicRatio(collect, statisticalName); + List harmonicRatioList = harmonicRatioService.getFirstHaronicRatio(collect, statisticalName); harmonicRatioList.forEach(temp->{ ThdDataVO thdDataVO = new ThdDataVO(); BeanUtils.copyProperties(temp,thdDataVO); @@ -133,10 +137,10 @@ public class StableDataServiceImpl implements StableDataService { @Override public List queryThdContentByTime(ThdDataQueryParm thdDataQueryParm) { List thdDataVOList = new ArrayList<>(); - List csLinePOList = csLinePOService.queryByDevId(thdDataQueryParm.getDevId()); + List csLinePOList = csLineFeignClient.queryLineByDevId(thdDataQueryParm.getDevId()).getData(); Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); List collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); - List harmonicRatioList = haronicRatioService.getHaronicRatio(collect, thdDataQueryParm.getStatisticalName(),thdDataQueryParm.getStartTime(), thdDataQueryParm.getEndTime()); + List harmonicRatioList = harmonicRatioService.getHaronicRatio(collect, thdDataQueryParm.getStatisticalName(),thdDataQueryParm.getStartTime(), thdDataQueryParm.getEndTime()); harmonicRatioList.forEach(temp->{ ThdDataVO thdDataVO = new ThdDataVO(); BeanUtils.copyProperties(temp,thdDataVO);