diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLedgerFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLedgerFeignClient.java index 71af3a0..ff943f5 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLedgerFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLedgerFeignClient.java @@ -1,7 +1,11 @@ package com.njcn.csdevice.api; +import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.api.fallback.CsLedgerFeignClientFallbackFactory; import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.dto.LineParamDTO; @@ -39,4 +43,9 @@ public interface CsLedgerFeignClient { @PostMapping("/deviceTree") @ApiOperation("三层设备树(装置层)") HttpResult> getDeviceTree(); - } + + @PostMapping("/getAllLedger") + HttpResult> getAllLedger(); + + +} diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLedgerFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLedgerFeignClientFallbackFactory.java index 0d402ee..083fc46 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLedgerFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLedgerFeignClientFallbackFactory.java @@ -62,6 +62,12 @@ public class CsLedgerFeignClientFallbackFactory implements FallbackFactory> getAllLedger() { + log.error("{}异常,降级处理,异常为:{}","获取台账树所有数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java index 1b12905..75d9853 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java @@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.dto.LineParamDTO; import com.njcn.csdevice.pojo.param.CsLedgerParam; @@ -39,6 +40,7 @@ import java.util.List; public class CsLedgerController extends BaseController { private final ICsLedgerService csLedgerService; + private final CsLedgerMapper csLedgerMapper; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/tree") @@ -145,5 +147,14 @@ public class CsLedgerController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, details, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getAllLedger") + @ApiOperation("获取台账树所有数据") + public HttpResult> getAllLedger(){ + String methodDescribe = getMethodDescribe("getAllLedger"); + List allList = csLedgerMapper.getAll(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, allList, methodDescribe); + } + } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java index 6d4fec4..574dc50 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java @@ -107,15 +107,15 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService List list2 = onlineRateFeignClient.list(deviceList,param.getStartTime(),param.getEndTime()).getData(); //获取监测点最新数据时间 List list3 = csLineLatestDataFeignClient.listData().getData(); - equipmentDeliveryList.forEach(dev->{ List list = devMap.get(dev.getId()); - DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(dev.getId()).getData(); + if (CollectionUtil.isNotEmpty(list)) { list.forEach(line->{ + DevDetailDTO dto = csLedgerFeignClient.queryDevDetail(dev.getId()).getData(); HalfMonthReportVO vo = new HalfMonthReportVO(); - vo.setEngineeringName(devDetail.getEngineeringName()); - vo.setProjectName(devDetail.getProjectName()); + vo.setEngineeringName(dto.getEngineeringName()); + vo.setProjectName(dto.getProjectName()); vo.setDevName(dev.getName()); vo.setDevType(dev.getDevModel()); vo.setMac(dev.getMac());