提交 a04d55cb authored 作者: 133's avatar 133

[装备] 添加字段 前台使用

上级 a6d2abe3
流水线 #308 已失败 于阶段
in 367 分 37 秒
...@@ -352,6 +352,9 @@ public class DeviceLibraryController { ...@@ -352,6 +352,9 @@ public class DeviceLibraryController {
deviceLibraryEntity -> Optional.ofNullable(nodeCollect.get(deviceLibraryEntity.getPartParentId())), deviceLibraryEntity -> Optional.ofNullable(nodeCollect.get(deviceLibraryEntity.getPartParentId())),
DeviceLibrary::addChildNode DeviceLibrary::addChildNode
); );
containList.forEach(
deviceLibrary -> deviceLibrary.setIsOne(1)
);
Map<Integer,String> lifeStatusMap = configCache.getLifeStatusMap(); Map<Integer,String> lifeStatusMap = configCache.getLifeStatusMap();
Map<Integer,String> matchingRangeMap = configCache.getMatchingRangeMap(); Map<Integer,String> matchingRangeMap = configCache.getMatchingRangeMap();
//形态 //形态
...@@ -744,7 +747,6 @@ public class DeviceLibraryController { ...@@ -744,7 +747,6 @@ public class DeviceLibraryController {
map.put("success","装备序列号信息更新成功"); map.put("success","装备序列号信息更新成功");
} }
return ResponseEntity.ok(map); return ResponseEntity.ok(map);
} }
@ApiOperation(value = "根据装备id查询装备详情", notes = "根据装备id查询装备详情") @ApiOperation(value = "根据装备id查询装备详情", notes = "根据装备id查询装备详情")
......
...@@ -265,6 +265,10 @@ public class DeviceLibrary { ...@@ -265,6 +265,10 @@ public class DeviceLibrary {
@Transient @Transient
private String allotTypeName; private String allotTypeName;
@ApiModelProperty(value = "是否一级")
@Transient
private int isOne;
public void addChildNode(DeviceLibrary deviceLibraryEntity) { public void addChildNode(DeviceLibrary deviceLibraryEntity) {
childs.add(deviceLibraryEntity); childs.add(deviceLibraryEntity);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论