diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisTagDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisTagDTO.java index 747fa26..00eb408 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisTagDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisTagDTO.java @@ -42,9 +42,9 @@ public class PowerAxisTagDTO implements Serializable { private String categoryName; /** - * 排序 正序 + * 对应节点等级 0,1,2 */ - private Integer sort; + private Integer structLevel; /** * 禁用状态 0.正常 1.已禁用 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java index c60eda3..7139267 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisTagCategoryResultDTO.java @@ -25,4 +25,9 @@ public class PowerAxisTagCategoryResultDTO implements Serializable { * 标签类别名称 */ private String categoryName; + + /** + * 对应节点等级 0,1,2 + */ + private Integer structLevel; } diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java index 2630e2e..2a9083a 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisTagEntity.java @@ -42,9 +42,9 @@ public class PowerAxisTagEntity extends BaseEpmetEntity { private String categoryName; /** - * 排序 正序 + * 对应节点等级 0,1,2 */ - private Integer sort; + private Integer structLevel; /** * 禁用状态 0.正常 1.已禁用 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java index 99ca439..0926cba 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisTagServiceImpl.java @@ -106,7 +106,7 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl - + @@ -24,11 +24,12 @@ +