From 8e3f27eeaf1c772f444a5efb7134c2e541bcb63a Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Thu, 6 Mar 2025 13:50:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E5=B8=83=E7=9A=84=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EdTagLibraryController.java    |  4 +-
 .../serviceimpl/EdTagLibraryServiceImpl.java  | 54 ++++++++++++-------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
index 67bfa94..0b2c473 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
@@ -47,9 +47,9 @@ public class EdTagLibraryController {
     }
 
     // 发布标签
-    @GetMapping("/batchPublish")
+    @PostMapping("/batchPublish")
     @UserOperation(value="发布了标签组", modelName = UserOperationModuleEnum.TAG)
-    public ElectromagneticResult<?> publishTag(@RequestParam List<String> tagIds) {
+    public ElectromagneticResult<?> publishTag(@RequestBody List<String> tagIds) {
         return ElectromagneticResultUtil.success(edTagLibraryService.batchPublishTagGroups(tagIds));
     }
 
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
index 0df3ac1..3c72a11 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
@@ -36,13 +36,9 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
     @Override
     public Boolean createTagGroup(String tagName, String createdBy) {
 
+        Assert.isTrue(!checkNameExist(tagName),StrFormatter.format("该标签组 {} 已存在",tagName));
         // 查询当前最大排序值
-        Integer maxOrder = this.getBaseMapper()
-                .selectMaxOrder(TagTypeEnum.GROUP.getCode(), "0");
-        if (maxOrder == null) {
-            maxOrder = 0;
-        }
-
+        Integer maxOrder = selectMaxOrder(TagTypeEnum.GROUP.getCode(), "0");
         EdTagLibrary tagGroup = new EdTagLibrary();
         tagGroup.setTagId(IdWorker.getSnowFlakeIdString());
         tagGroup.setParentId("0"); // 标签组父节点为"0"
@@ -66,14 +62,9 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
      */
     @Override
     public Boolean createTag(String parentId, String tagName, String createdBy) {
-
+        Assert.isTrue(!checkNameExist(tagName),StrFormatter.format("该标签名 {} 已存在",tagName));
         // 查询当前组内最大排序值
-        Integer maxOrder = this.getBaseMapper()
-                .selectMaxOrder(TagTypeEnum.TAG.getCode(), parentId);
-        if (maxOrder == null) {
-            maxOrder = 0;
-        }
-
+        Integer maxOrder = selectMaxOrder(TagTypeEnum.TAG.getCode(), parentId);
         EdTagLibrary tag = new EdTagLibrary();
         tag.setTagId(IdWorker.getSnowFlakeIdString());
         tag.setParentId(parentId);
@@ -108,13 +99,14 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
         EdTagLibrary newTag = this.getOne(new LambdaQueryWrapper<EdTagLibrary>()
                 .eq(EdTagLibrary::getTagId, newTagId));
 
-        Assert.notNull(tag,"标签不存在");
-        Assert.notNull(newTag, "无法将标签移动到此位置");
+        Assert.notNull(tag,"此标签/标签组不存在");
+        Assert.notNull(newTag, "无法将标签/标签组移动到此位置");
 
         // 若标签挪到空标签组下，newTagId为新标签组Id
         if (!tag.getType().equals(newTag.getType())) {
             if (tag.getType().equals(TagTypeEnum.TAG.getCode())) {
                 newParentId = newTagId;
+                newOrderBy = 1;
             } else {
                 throw new BizException("标签组无法移动到标签下");
             }
@@ -127,11 +119,11 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
 
         if (isMoveToNewGroup) {
             // 旧组重新排序
-            int max = this.baseMapper.selectMaxOrder(tag.getType(),oldParentId)+1;
+            int max = selectMaxOrder(tag.getType(),oldParentId)+1;
             reorderTagGroup(oldParentId, oldOrderBy, max);
 
             // 新组重新排序
-            max = this.baseMapper.selectMaxOrder(tag.getType(), newParentId)+1;
+            max = selectMaxOrder(tag.getType(), newParentId)+1;
             reorderTagGroup(newParentId, max, newOrderBy);
         } else {
             // 仅更新同组内的排序
@@ -145,7 +137,7 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
                 .set(EdTagLibrary::getOrderBy, newOrderBy)
                 .set(EdTagLibrary::getUpdatedBy, updatedBy));
         if (isUpdated) {
-            UserThreadLocal.setSuccessInfo("", tagId, StrFormatter.format("更新了标签{}的排序", tag.getTagName()));
+            UserThreadLocal.setSuccessInfo("", tagId, StrFormatter.format("更新了标签 {} 的排序", tag.getTagName()));
         }
         return isUpdated;
     }
@@ -189,7 +181,7 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
         // 删除本身
         boolean isDeleted =  this.removeById(tagId);
         if (isDeleted) {
-            UserThreadLocal.setSuccessInfo("", tagId, StrFormatter.format("删除了标签{}", tag.getTagName()));
+            UserThreadLocal.setSuccessInfo("", tagId, StrFormatter.format("删除了标签 {} ", tag.getTagName()));
         }
         return isDeleted;
     }
@@ -235,13 +227,14 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
      */
     @Override
     public Boolean updateTagInfo(String tagId, String tagName, String updatedBy) {
+        Assert.isTrue(!checkNameExist(tagName), StrFormatter.format("该标签/标签组名 {} 已存在" , tagName));
         LambdaUpdateWrapper<EdTagLibrary> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(EdTagLibrary::getTagId, tagId)
                 .set(EdTagLibrary::getTagName, tagName)
                 .set(EdTagLibrary::getUpdatedBy, updatedBy);
         boolean isUpdated = this.update(updateWrapper);
         if (isUpdated) {
-            UserThreadLocal.setSuccessInfo("", tagId, StrFormatter.format("更新了标签{}信息", tagName));
+            UserThreadLocal.setSuccessInfo("", tagId, StrFormatter.format("更新了标签 {} 信息", tagName));
         }
         return isUpdated;
     }
@@ -329,5 +322,26 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
                     return info;
                 }).collect(Collectors.toList());
     }
+
+    /**
+     * 校验名字是否重复
+     * @param tagName
+     * @return
+     */
+    private boolean checkNameExist(String tagName) {
+        LambdaQueryWrapper<EdTagLibrary> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EdTagLibrary::getTagName, tagName);
+        return this.count(queryWrapper) > 0;
+    }
+
+    /**
+     * 计算顺序
+     * @return maxOrder
+     */
+    private int selectMaxOrder(int typeCode, String parentId) {
+        // 查询当前最大排序值
+        int maxOrder = Optional.ofNullable(this.getBaseMapper().selectMaxOrder(typeCode, parentId)).orElse(0);
+        return maxOrder;
+    }
 }