修改标签相关逻辑

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.已禁用

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;
 }

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.已禁用

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<PowerAxisTagDao, Po
         wrapper.eq("TAG_CATEGORY", tagCategory)
                 .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value())
                 .eq(FieldConstant.CUSTOMER_ID, loginUserUtil.getLoginUserCustomerId())
-                .orderByAsc("SORT", FieldConstant.CREATED_TIME);
+                .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME);
 
         return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class);
     }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml

@@ -9,7 +9,7 @@
         <result property="tagCategory" column="TAG_CATEGORY"/>
         <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="categoryName" column="CATEGORY_NAME"/>
-        <result property="sort" column="SORT"/>
+        <result property="structLevel" column="STRUCT_LEVEL"/>
         <result property="forbiddenFlag" column="FORBIDDEN_FLAG"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
@@ -24,11 +24,12 @@
         <collection property="tagList" ofType="com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO">
             <result property="categoryCode" column="CATEGORY_CODE" />
             <result property="categoryName" column="CATEGORY_NAME" />
+            <result property="structLevel" column="STRUCT_LEVEL" />
         </collection>
     </resultMap>
 
     <select id="listSimpleAll" resultMap="listSimpleAllResultMap">
-        select t.TAG_CATEGORY,t.CATEGORY_NAME,t.CATEGORY_CODE from pli_power_axis_tag t where t.DEL_FLAG = '0' and t.FORBIDDEN_FLAG = '0' order by t.SORT
+        select t.TAG_CATEGORY,t.CATEGORY_NAME,t.CATEGORY_CODE,t.STRUCT_LEVEL from pli_power_axis_tag t where t.DEL_FLAG = '0' and t.FORBIDDEN_FLAG = '0' order by t.STRUCT_LEVEL
     </select>