From 9e56e47f1b7cdb10004796d60c07313c9fc9cc23 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 18 Aug 2023 15:37:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csdevice/service/impl/CsGroupServiceImpl.java | 10 ++++------ .../csharmonic/service/impl/LineTargetServiceImpl.java | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index f553ddc..f268d4b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -108,10 +108,9 @@ public class CsGroupServiceImpl extends ServiceImpl impl EnergyTemplateVO vo = new EnergyTemplateVO(); BeanUtils.copyProperties(item,vo); EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData(); - String tableName = dicDataFeignClient.getDicDataById(eleEpdPqd.getClassId()).getData().getCode(); - vo.setClassId(tableName); + vo.setClassId(eleEpdPqd.getClassId()); vo.setUnit(eleEpdPqd.getUnit()); - StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,tableName,item.getName(),item.getPhase(),item.getStatMethod(),clDid); + StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,eleEpdPqd.getClassId(),item.getName(),item.getPhase(),item.getStatMethod(),clDid); if (!Objects.isNull(statisticalDataDTO)){ vo.setTime(statisticalDataDTO.getTime()); vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); @@ -165,10 +164,9 @@ public class CsGroupServiceImpl extends ServiceImpl impl EnergyTemplateVO vo = new EnergyTemplateVO(); BeanUtils.copyProperties(item,vo); EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData(); - String tableName = dicDataFeignClient.getDicDataById(eleEpdPqd.getClassId()).getData().getCode(); - vo.setClassId(tableName); + vo.setClassId(eleEpdPqd.getClassId()); vo.setUnit(eleEpdPqd.getUnit()); - StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),tableName,item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime(),clDid); + StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),eleEpdPqd.getClassId(),item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime(),clDid); if (!Objects.isNull(statisticalDataDTO)){ vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue()); vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getMinValue()).setScale(4, RoundingMode.UP).doubleValue()); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java index 9a67409..19a40a3 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java @@ -118,9 +118,8 @@ public class LineTargetServiceImpl implements ILineTargetService { String targetName = dataArray.getAnotherName(); String dataId = dataArray.getDataId(); String classId = epdFeignClient.selectById(dataId).getData().getClassId(); - String tableName = dicDataFeignClient.getDicDataById(classId).getData().getCode(); String clDid = getClDid(item.getLineId().get(3)); - result.add(getLineRtData(item.getId(),item.getLineId().get(3),tableName,targetTag,phasic,dataType,targetName,clDid)); + result.add(getLineRtData(item.getId(),item.getLineId().get(3),classId,targetTag,phasic,dataType,targetName,clDid)); } }); return result;