From 5952eaa97d54a6b4d3d674dad294f4a1a5a95eeb Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 28 Jul 2022 17:34:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/axis/service/impl/PowerAxisStructServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
index 34bad4f..1351b4c 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
@@ -144,7 +144,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下只允许存在一个顶级节点");
             }
         } else {
-            int parentStructLevel = powerAxisTagService.selectStructLevelById(customerId, PowerTagCategoryEnum.STRUCT.category(), structDto.getPid());
+            Integer parentStructLevel = powerAxisTagService.selectStructLevelById(customerId, PowerTagCategoryEnum.STRUCT.category(), structDto.getPid());
             if (structLevel - parentStructLevel > NumConstant.ONE) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "无法跨级添加节点");
             }
@@ -274,4 +274,4 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         }
         return baseDao.getRootAxisStructId(customerId, agencyId, PowerTagLevelEnum.ROOT.level());
     }
-}
\ No newline at end of file
+}

From be89c299eaa556c4006c887f4e9bf1e184204c6f Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 29 Jul 2022 13:31:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?message:=E4=BF=AE=E6=94=B9=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=B1=BB=E5=9E=8B=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/axis/dao/PowerAxisTagDao.java      |  6 +++++-
 .../service/impl/PowerAxisTagServiceImpl.java  | 18 +++++++++++-------
 .../mapper/poweraxis/PowerAxisTagDao.xml       | 10 +++++++++-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java
index ef10c7e..babc8bd 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisTagDao.java
@@ -2,6 +2,7 @@ package com.epmet.plugin.power.modules.axis.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.plugin.power.dto.axis.result.PowerAxisAllTagCategoryResultDTO;
+import com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerAxisTagEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -39,4 +40,7 @@ public interface PowerAxisTagDao extends BaseDao<PowerAxisTagEntity> {
     Integer selectStructLevelById(@Param("customerId") String customerId,
                                   @Param("tagCategory") String tagCategory,
                                   @Param("axisStructId") String axisStructId);
-}
\ No newline at end of file
+
+    List<PowerAxisTagCategoryResultDTO> selectByTagCategory(@Param("tagCategory") String tagCategory,
+                                                            @Param("customerId") String customerId);
+}
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 36ef95e..a7d0b14 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
@@ -102,13 +102,17 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "缺少参数");
         }
 
-        QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("TAG_CATEGORY", tagCategory)
-                .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value())
-                .eq(FieldConstant.CUSTOMER_ID, customerId)
-                .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME);
+        List<PowerAxisTagCategoryResultDTO> res = baseDao.selectByTagCategory(tagCategory,customerId);
+        return res;
+
 
-        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class);
+//        QueryWrapper<PowerAxisTagEntity> wrapper = new QueryWrapper<>();
+//        wrapper.eq("TAG_CATEGORY", tagCategory)
+//                .eq("FORBIDDEN_FLAG", EpmetDelFlagEnum.NORMAL.value())
+//                .eq(FieldConstant.CUSTOMER_ID, customerId)
+//                .orderByAsc("STRUCT_LEVEL", FieldConstant.CREATED_TIME);
+//
+//        return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), PowerAxisTagCategoryResultDTO.class);
     }
 
     @Override
@@ -135,4 +139,4 @@ public class PowerAxisTagServiceImpl extends BaseServiceImpl<PowerAxisTagDao, Po
     public Integer selectStructLevelById(String customerId, String tagCategory, String axisStructId) {
         return baseDao.selectStructLevelById(customerId, tagCategory, axisStructId);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml
index d0005b3..27034ee 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisTagDao.xml
@@ -45,6 +45,14 @@
             AND t.CUSTOMER_ID = #{customerId}
             AND s.id = #{axisStructId}
     </select>
+    <select id="selectByTagCategory"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisTagCategoryResultDTO">
+        select * from pli_power_axis_tag where
+            TAG_CATEGORY = #{tagCategory}
+	        AND FORBIDDEN_FLAG = '0'
+	        AND CUSTOMER_ID = #{customerId}
+	        order by STRUCT_LEVEL,CREATED_TIME DESC
+    </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>