|
@@ -165,17 +165,17 @@ public class MeterTreeController extends BladeController {
|
|
|
@GetMapping("/system/getEngineeringTypeName")
|
|
|
@ApiOperationSupport(order = 5)
|
|
|
@ApiOperation(value = "系统树节点新增获取工程类型名称", notes = "传入id")
|
|
|
- public R<Object> getEngineeringTypeName(@RequestParam String id) {
|
|
|
+ public R<Object> getSystemEngineeringTypeName(@RequestParam String id) {
|
|
|
MeterTreeSystem node = meterTreeSystemService.getById(id);
|
|
|
if (node != null) {
|
|
|
- String resultNodeName = getTheParentRecursivelyInReverse(node);
|
|
|
+ String resultNodeName = getSystemTheParentRecursivelyInReverse(node);
|
|
|
return R.data(ObjectUtil.isNotEmpty(resultNodeName) ? resultNodeName : null);
|
|
|
}
|
|
|
return R.data(null);
|
|
|
}
|
|
|
|
|
|
- /*获取第二层级节点名称*/
|
|
|
- private String getTheParentRecursivelyInReverse(MeterTreeSystem node) {
|
|
|
+ /*系统获取第二层级节点名称*/
|
|
|
+ private String getSystemTheParentRecursivelyInReverse(MeterTreeSystem node) {
|
|
|
if (node != null) {
|
|
|
MeterTreeSystem parentNode = meterTreeSystemService.getOne(Wrappers.<MeterTreeSystem>lambdaQuery()
|
|
|
.select(MeterTreeSystem::getNodeName, MeterTreeSystem::getParentId, MeterTreeSystem::getAncestor)
|
|
@@ -186,7 +186,7 @@ public class MeterTreeController extends BladeController {
|
|
|
if (parentNode.getAncestor().split(",").length == 2) {
|
|
|
return parentNode.getNodeName();
|
|
|
} else if (parentNode.getAncestor().split(",").length > 2) {
|
|
|
- return getTheParentRecursivelyInReverse(parentNode);
|
|
|
+ return getSystemTheParentRecursivelyInReverse(parentNode);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -363,6 +363,37 @@ public class MeterTreeController extends BladeController {
|
|
|
return R.data(meterTreeProjectService.save(obj));
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("/project/getEngineeringTypeName")
|
|
|
+ @ApiOperationSupport(order = 15)
|
|
|
+ @ApiOperation(value = "项目树节点新增获取工程类型名称", notes = "传入id")
|
|
|
+ public R<Object> getProjectEngineeringTypeName(@RequestParam String id) {
|
|
|
+ MeterTreeProject node = meterTreeProjectService.getById(id);
|
|
|
+ if (node != null) {
|
|
|
+ String resultNodeName = getProjectTheParentRecursivelyInReverse(node);
|
|
|
+ return R.data(ObjectUtil.isNotEmpty(resultNodeName) ? resultNodeName : null);
|
|
|
+ }
|
|
|
+ return R.data(null);
|
|
|
+ }
|
|
|
+
|
|
|
+ /*获取项目第二层级节点名称*/
|
|
|
+ private String getProjectTheParentRecursivelyInReverse(MeterTreeProject node) {
|
|
|
+ if (node != null) {
|
|
|
+ MeterTreeProject parentNode = meterTreeProjectService.getOne(Wrappers.<MeterTreeProject>lambdaQuery()
|
|
|
+ .select(MeterTreeProject::getNodeName, MeterTreeProject::getParentId, MeterTreeProject::getAncestor)
|
|
|
+ .eq(MeterTreeProject::getId, node.getParentId())
|
|
|
+ .eq(MeterTreeProject::getStatus, 1)
|
|
|
+ );
|
|
|
+ if (parentNode != null) {
|
|
|
+ if (parentNode.getAncestor().split(",").length == 2) {
|
|
|
+ return parentNode.getNodeName();
|
|
|
+ } else if (parentNode.getAncestor().split(",").length > 2) {
|
|
|
+ return getProjectTheParentRecursivelyInReverse(parentNode);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("/project/update")
|
|
|
@ApiOperationSupport(order = 16)
|
|
|
@ApiOperation(value = "项目树节点修改", notes = "传入MeterTreeProject")
|