From 5c57f9b26a895c186e57d3c639904d9c5ab78fbd Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Wed, 19 Apr 2023 10:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E6=A0=87=E7=AD=BE=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E6=B5=AE?=
 =?UTF-8?q?=E7=82=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TreeLabelManagerController.java           | 20 ++++++++++++++++--
 .../adc/da/report/dao/mysql/TreeLabelDao.java |  2 +-
 .../com/adc/da/report/eo/TreeLabelEntity.java |  7 +------
 .../da/report/service/ITreeLabelService.java  |  9 ++++++--
 .../service/impl/ITreeLabelServiceImpl.java   | 21 ++++++++++++-------
 .../com/adc/da/report/vo/TreeLabelVo.java     |  3 ++-
 .../mybatis/mapper/mysql/TreeLabelDao.xml     | 21 +++++++++++++++++++
 7 files changed, 64 insertions(+), 19 deletions(-)
 create mode 100644 adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml

diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java b/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java
index dd4c4cc..1b72c03 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/controller/TreeLabelManagerController.java
@@ -37,12 +37,28 @@ public class TreeLabelManagerController {
      * @param treeLabelVo
      * @return
      */
-    @ApiOperation("新增或编辑标签")
+    @ApiOperation("新增标签")
     @PostMapping("/add")
     public ResponseMessage add(@Valid @RequestBody TreeLabelVo treeLabelVo) {
         TreeLabelEntity treeLabelEntity = Convert.convert(TreeLabelEntity.class, treeLabelVo);
         iTreeLabelService.saveOrUpdateTag(treeLabelEntity);
         return Result.success();
+
+
+    }
+
+    /**
+     * 新增或编辑标签
+     *
+     * @param treeLabelVo
+     * @return
+     */
+    @ApiOperation("编辑标签")
+    @PostMapping("/update")
+    public ResponseMessage update(@Valid @RequestBody TreeLabelVo treeLabelVo) {
+        TreeLabelEntity treeLabelEntity = Convert.convert(TreeLabelEntity.class, treeLabelVo);
+        iTreeLabelService.saveOrUpdateTag(treeLabelEntity);
+        return Result.success();
     }
 
     /**
@@ -55,7 +71,7 @@ public class TreeLabelManagerController {
     @ApiOperation("标签列表")
     @GetMapping("/list")
     public ResponseMessage list(@RequestParam(value = "like", required = false) String like
-                                ) throws ExecutionException, InterruptedException {
+    ) throws ExecutionException, InterruptedException {
         List<TreeLabelVo> rootLabel = iTreeLabelService.getTreeLabellist(like);
         return Result.success(rootLabel);
     }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java
index 647b8de..d4cdcfc 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TreeLabelDao.java
@@ -16,7 +16,7 @@ public interface TreeLabelDao extends BaseMapper<TreeLabelEntity> {
      * @param parentId
      * @return
      */
-    int getMaxNum(String parentId);
+    double getMaxNum(String parentId);
 }
 
 
diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java
index 8a75f64..e00cd1a 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TreeLabelEntity.java
@@ -51,12 +51,7 @@ public class TreeLabelEntity implements Serializable {
     /**
      * 
      */
-    private Integer orderNum;
-
-    /**
-     * 0代表未删除，1代表已删除
-     */
-    private Integer delFlag;
+    private Double orderNum;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java b/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java
index 260facf..6333b0e 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/ITreeLabelService.java
@@ -14,8 +14,9 @@ import java.util.List;
 public interface ITreeLabelService extends IService<TreeLabelEntity> {
 
     /**
-     * 返回树形结构
+     * 获取标签树形结构
      *
+     * @param like 模糊查询字段
      * @return
      */
     List<TreeLabelVo> getTreeLabellist(String like);
@@ -28,7 +29,10 @@ public interface ITreeLabelService extends IService<TreeLabelEntity> {
     void saveOrUpdateTag(TreeLabelEntity treeLabelEntity);
 
     /**
-     * 自动维护顺序的删除标签方法
+     * 删除标签
+     *
+     * @param id 标签id
+     * @return
      */
     boolean deleteByIdAutoOrder(String id);
 
@@ -38,4 +42,5 @@ public interface ITreeLabelService extends IService<TreeLabelEntity> {
      * @return
      */
     boolean deleteById(String id);
+
 }
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java
index 46a2869..dd8a121 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITreeLabelServiceImpl.java
@@ -36,10 +36,8 @@ public class ITreeLabelServiceImpl extends ServiceImpl<TreeLabelDao, TreeLabelEn
 
     @Override
     public List<TreeLabelVo> getTreeLabellist(String like) {
-        //查询所有未删除的标签
-        LambdaQueryWrapper<TreeLabelEntity> treeLabelEntityWrapper = new LambdaQueryWrapper<>();
-        treeLabelEntityWrapper.eq(TreeLabelEntity::getDelFlag, TreeLabelConstants.UNDELETE);
-        List<TreeLabelEntity> treeLabelEntities = treeLabelDao.selectList(treeLabelEntityWrapper);
+        //查询所有标签
+        List<TreeLabelEntity> treeLabelEntities = list();
         //找出根节点
         TreeLabelEntity rootTag = treeLabelEntities.stream().
                 filter(treeLabelEntity ->
@@ -93,10 +91,19 @@ public class ITreeLabelServiceImpl extends ServiceImpl<TreeLabelDao, TreeLabelEn
         if (StringUtils.isEmpty(entity.getId())) {
             entity.setId(UUID.randomUUID10());
             entity.setCreateDate(format.format(new Date()));
+            if (Objects.isNull(entity.getOrderNum())) {
+                double maxNum = treeLabelDao.getMaxNum(entity.getParentId());
+                entity.setOrderNum(maxNum + 1);
+            }
             treeLabelDao.insert(entity);
         } else {
             //编辑标签
-            treeLabelDao.updateById(entity);
+            TreeLabelEntity treeLabelEntity = treeLabelDao.selectById(entity.getId());
+            if (Objects.nonNull(treeLabelEntity)) {
+                treeLabelDao.updateById(entity);
+            } else {
+                throw new AdcDaBaseException("标签id无效");
+            }
         }
     }
 
@@ -104,8 +111,8 @@ public class ITreeLabelServiceImpl extends ServiceImpl<TreeLabelDao, TreeLabelEn
     public boolean deleteByIdAutoOrder(String id) {
         TreeLabelEntity labelEntity = treeLabelDao.selectById(id);
         String parentId = labelEntity.getParentId();
-        int currentNum = labelEntity.getOrderNum();
-        int maxNum = treeLabelDao.getMaxNum(parentId);
+        double currentNum = labelEntity.getOrderNum();
+        double maxNum = treeLabelDao.getMaxNum(parentId);
         //删除标签
         treeLabelDao.delete(new QueryWrapper<TreeLabelEntity>().eq("id", id));
         //如果删除的不是最后一个标签，需要移动前面的标签
diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java
index 3771bbe..a8ee8f8 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/vo/TreeLabelVo.java
@@ -37,12 +37,13 @@ public class TreeLabelVo {
     /**
      * 父id
      */
+    @NotBlank(message = "上级标签不能为空")
     private String parentId;
 
     /**
      *
      */
-    private Integer orderNum;
+    private Double orderNum;
 
     /**
      * 子标签
diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml
new file mode 100644
index 0000000..db1b394
--- /dev/null
+++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TreeLabelDao.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.report.dao.mysql.TreeLabelDao">
+
+    <resultMap id="BaseResultMap" type="com.adc.da.report.eo.TreeLabelEntity">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="name" column="name" jdbcType="VARCHAR"/>
+        <result property="parentid" column="parent_id" jdbcType="VARCHAR"/>
+        <result property="createdate" column="create_date" jdbcType="VARCHAR"/>
+        <result property="ordernum" column="order_num" jdbcType="DOUBLE"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="getMaxNum" parameterType="string" resultType="double">
+        select max(t.order_num)
+        from ts_tree_label t
+        where t.parent_id = #{parentId}
+    </select>
+</mapper>