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

代码优化

Browse Source
This commit is contained in:
xy
2024-11-28 17:34:37 +08:00
parent ea3cff888b
commit e37ace2fd7
1 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,16 +371,24 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
private void setDataSetValues(CsEquipmentDeliveryPO csEquipmentDeliveryPo, List<CsDataSet> dataSet, List<DeviceManagerVO.DataSetVO> dataSetList, String type, DeviceManagerVO deviceManagerVo) { private void setDataSetValues(CsEquipmentDeliveryPO csEquipmentDeliveryPo, List<CsDataSet> dataSet, List<DeviceManagerVO.DataSetVO> dataSetList, String type, DeviceManagerVO deviceManagerVo) {
BeanUtils.copyProperties(csEquipmentDeliveryPo, deviceManagerVo); BeanUtils.copyProperties(csEquipmentDeliveryPo, deviceManagerVo);
if (CollUtil.isNotEmpty(dataSet)) { if (CollUtil.isNotEmpty(dataSet)) {
// for (CsDataSet item : dataSet) { if (Objects.equals(type, "rt")) {
for (CsDataSet item : dataSet) {
DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
dataSetVO.setId(item.getId());
dataSetVO.setName(item.getAnotherName());
dataSetVO.setType("rt");
dataSetList.add(dataSetVO);
deviceManagerVo.setDataLevel(item.getDataLevel());
}
} else {
CsDataSet item = dataSet.get(0); CsDataSet item = dataSet.get(0);
//准实时数据 //准实时数据
DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO(); DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
dataSetVO.setId(item.getId()); dataSetVO.setId(item.getId());
dataSetVO.setName("history".equals(type) ? "准实时数据":item.getAnotherName()); dataSetVO.setName("准实时数据");
dataSetVO.setType("rt"); dataSetVO.setType("history");
dataSetList.add(dataSetVO); dataSetList.add(dataSetVO);
deviceManagerVo.setDataLevel(item.getDataLevel()); deviceManagerVo.setDataLevel(item.getDataLevel());
if (Objects.equals(type, "history")) {
//历史数据tab //历史数据tab
DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO(); DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
dataSetVo2.setId(item.getId()); dataSetVo2.setId(item.getId());
@@ -416,7 +424,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
dataSetList.add(dataSetVo6); dataSetList.add(dataSetVo6);
} }
} }
// }
deviceManagerVo.setDataSetList(dataSetList); deviceManagerVo.setDataSetList(dataSetList);
List<CsLinePO> csLinePOS = csLinePOService.findByNdid(csEquipmentDeliveryPo.getNdid()); List<CsLinePO> csLinePOS = csLinePOService.findByNdid(csEquipmentDeliveryPo.getNdid());
if(!csLinePOS.isEmpty() && csLinePOS.get(0)!=null){ if(!csLinePOS.isEmpty() && csLinePOS.get(0)!=null){