Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
xuyang
2023-08-18 15:37:24 +08:00
parent dfea2cc651
commit 9e56e47f1b
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
View File

@@ -108,10 +108,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
EnergyTemplateVO vo = new EnergyTemplateVO(); EnergyTemplateVO vo = new EnergyTemplateVO();
BeanUtils.copyProperties(item,vo); BeanUtils.copyProperties(item,vo);
EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData(); EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
String tableName = dicDataFeignClient.getDicDataById(eleEpdPqd.getClassId()).getData().getCode(); vo.setClassId(eleEpdPqd.getClassId());
vo.setClassId(tableName);
vo.setUnit(eleEpdPqd.getUnit()); 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)){ if (!Objects.isNull(statisticalDataDTO)){
vo.setTime(statisticalDataDTO.getTime()); vo.setTime(statisticalDataDTO.getTime());
vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); vo.setDataValue(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue());
@@ -165,10 +164,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
EnergyTemplateVO vo = new EnergyTemplateVO(); EnergyTemplateVO vo = new EnergyTemplateVO();
BeanUtils.copyProperties(item,vo); BeanUtils.copyProperties(item,vo);
EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData(); EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
String tableName = dicDataFeignClient.getDicDataById(eleEpdPqd.getClassId()).getData().getCode(); vo.setClassId(eleEpdPqd.getClassId());
vo.setClassId(tableName);
vo.setUnit(eleEpdPqd.getUnit()); 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)){ if (!Objects.isNull(statisticalDataDTO)){
vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue()); vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue());
vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getMinValue()).setScale(4, RoundingMode.UP).doubleValue()); vo.setMinValue(BigDecimal.valueOf(statisticalDataDTO.getMinValue()).setScale(4, RoundingMode.UP).doubleValue());

3
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
View File

@@ -118,9 +118,8 @@ public class LineTargetServiceImpl implements ILineTargetService {
String targetName = dataArray.getAnotherName(); String targetName = dataArray.getAnotherName();
String dataId = dataArray.getDataId(); String dataId = dataArray.getDataId();
String classId = epdFeignClient.selectById(dataId).getData().getClassId(); String classId = epdFeignClient.selectById(dataId).getData().getClassId();
String tableName = dicDataFeignClient.getDicDataById(classId).getData().getCode();
String clDid = getClDid(item.getLineId().get(3)); 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; return result;