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

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

@@ -371,52 +371,59 @@ 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")) {
CsDataSet item = dataSet.get(0); 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);
//准实时数据 //准实时数据
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()); dataSetVo2.setName("历史统计数据");
dataSetVo2.setName("历史统计数据"); dataSetVo2.setType("history");
dataSetVo2.setType("history"); dataSetList.add(dataSetVo2);
dataSetList.add(dataSetVo2); deviceManagerVo.setDataLevel(item.getDataLevel());
deviceManagerVo.setDataLevel(item.getDataLevel()); //趋势数据tab
//趋势数据tab DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO();
DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO(); dataSetVo3.setId(item.getId());
dataSetVo3.setId(item.getId()); dataSetVo3.setName("历史趋势");
dataSetVo3.setName("历史趋势"); dataSetVo3.setType("trenddata");
dataSetVo3.setType("trenddata"); dataSetList.add(dataSetVo3);
dataSetList.add(dataSetVo3); //下面这些tab仅仅只限于设备监控的便携式设备才会有
//下面这些tab仅仅只限于设备监控的便携式设备才会有 if(DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType())){
if(DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType())){ //实时数据tab
//实时数据tab DeviceManagerVO.DataSetVO dataSetVo4 = new DeviceManagerVO.DataSetVO();
DeviceManagerVO.DataSetVO dataSetVo4 = new DeviceManagerVO.DataSetVO(); dataSetVo4.setId(item.getId());
dataSetVo4.setId(item.getId()); dataSetVo4.setName("实时数据");
dataSetVo4.setName("实时数据"); dataSetVo4.setType("realtimedata");
dataSetVo4.setType("realtimedata"); dataSetList.add(dataSetVo4);
dataSetList.add(dataSetVo4); //暂态事件tab
//暂态事件tab DeviceManagerVO.DataSetVO dataSetVo5 = new DeviceManagerVO.DataSetVO();
DeviceManagerVO.DataSetVO dataSetVo5 = new DeviceManagerVO.DataSetVO(); dataSetVo5.setId(item.getId());
dataSetVo5.setId(item.getId()); dataSetVo5.setName("暂态事件");
dataSetVo5.setName("暂态事件"); dataSetVo5.setType("event");
dataSetVo5.setType("event"); dataSetList.add(dataSetVo5);
dataSetList.add(dataSetVo5); //测试项tab
//测试项tab DeviceManagerVO.DataSetVO dataSetVo6 = new DeviceManagerVO.DataSetVO();
DeviceManagerVO.DataSetVO dataSetVo6 = new DeviceManagerVO.DataSetVO(); dataSetVo6.setId(item.getId());
dataSetVo6.setId(item.getId()); dataSetVo6.setName("测试项记录");
dataSetVo6.setName("测试项记录"); dataSetVo6.setType("items");
dataSetVo6.setType("items"); 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){