| | |
| | | // 设备 |
| | | Integer deviceNo = node.getDeviceNo(); |
| | | Element nodeTag = parent.addElement("node"); |
| | | nodeTag.addAttribute("name", deviceNo == 0 ? dataId.toString() : dataId.toString() + "-" + deviceNo); |
| | | nodeTag.addAttribute("real_name", deviceNo == 0 ? product.getName() : product.getName() + "-" + deviceNo); |
| | | nodeTag.addAttribute("name", dataId.toString() + "-" + deviceNo); |
| | | nodeTag.addAttribute("real_name", product.getName() + "-" + deviceNo); |
| | | nodeTag.addAttribute("name_path", product.getNamePath()); |
| | | nodeTag.addAttribute("type", "node"); |
| | | |
| | |
| | | .filter(item -> taskId.equals(item.getTaskId())) |
| | | .filter(item -> taskPhaseModel.getPhaseId().equals(item.getPhaseId())) |
| | | .filter(item -> taskPhaseModel.getOperatConditId().equals(item.getOperatConditId())) |
| | | .filter(item -> modelId.equals(item.getModelId())) |
| | | // .filter(item -> modelId.equals(item.getModelId())) |
| | | .filter(item -> dataId.equals(item.getProductId())) |
| | | .collect(Collectors.toList()).get(0); |
| | | } |