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

1.无线bug修改

Browse Source
This commit is contained in:
chendaofei
2024-09-24 09:08:20 +08:00
parent 509712b5b5
commit e836d9bd07
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java
View File

@@ -20,9 +20,6 @@ public class DataGroupEventVO {
@ApiModelProperty("事件ID") @ApiModelProperty("事件ID")
private String eventId; private String eventId;
@ApiModelProperty("变电站名称")
private String subName;
@ApiModelProperty("监测点ID") @ApiModelProperty("监测点ID")
private String lineId; private String lineId;

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

@@ -346,7 +346,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
for (CsDataSet item : dataSet) { for (CsDataSet item : dataSet) {
DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO(); DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
dataSetVO.setId(item.getId()); dataSetVO.setId(item.getId());
dataSetVO.setName("准实时数据"); dataSetVO.setName("history".equals(type) ? "准实时数据":item.getAnotherName());
dataSetVO.setType("rt"); dataSetVO.setType("rt");
dataSetList.add(dataSetVO); dataSetList.add(dataSetVO);
deviceManagerVo.setDataLevel(item.getDataLevel()); deviceManagerVo.setDataLevel(item.getDataLevel());

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

@@ -288,7 +288,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
@Override @Override
public Object deviceDataByType(CommonStatisticalQueryParam commonStatisticalQueryParam) { public Object deviceDataByType(CommonStatisticalQueryParam commonStatisticalQueryParam) {
String type = commonStatisticalQueryParam.getType(); String type = commonStatisticalQueryParam.getType();
if (type == null) throw new BusinessException(LineBaseEnum.NOTYPE_FAIL.getMessage()); if (type == null){
throw new BusinessException(LineBaseEnum.NOTYPE_FAIL.getMessage());
}
//传1 则是趋势数据tab页面 //传1 则是趋势数据tab页面
if("1".equals(type)){ if("1".equals(type)){
formatQueryParamList(commonStatisticalQueryParam); formatQueryParamList(commonStatisticalQueryParam);
@@ -419,14 +421,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
temp.setPhaseType(evtParamPhase.get(0).getValue()+(Objects.isNull(evtParamPhase.get(0).getUnit())?"":evtParamPhase.get(0).getUnit())); temp.setPhaseType(evtParamPhase.get(0).getValue()+(Objects.isNull(evtParamPhase.get(0).getUnit())?"":evtParamPhase.get(0).getUnit()));
} }
} }
//变电站名称
List<LineDetailVO.Detail> lineDetailVOS = lineFeignClient.getLineDetailByIds(Arrays.asList(temp.getLineId())).getData();
if(!lineDetailVOS.isEmpty()){
temp.setSubName(lineDetailVOS.get(0).getSubName());
}
//暂降幅值
List<RmpEventDetailPO> eventDetails = eventDetailFeignClient.getEventDetailByIdsList(Arrays.asList(temp.getEventId())).getData();
if(eventDetails !=null && !eventDetails.isEmpty()) temp.setFeatureAmplitude(PubUtils.floatRound(2, eventDetails.get(0).getFeatureAmplitude().floatValue()));
}); });
return returnpage; return returnpage;