From d2f9c6c8f89127ec6e11a78626ea5c5bcfa831dc Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 4 Sep 2024 17:59:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=8F=AF=E4=BB=A5=E6=89=B9=E9=87=8F=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileSplitMenuEOController.java         |   5 +-
 .../split/entity/SarFileSplitMenuEO.java      |   2 +
 .../mapper/SarFileSplitMenuEOMapper.java      |   2 +-
 .../mapper/xml/SarFileSplitMenuEOMapper.xml   |   5 +-
 .../service/ISarFileSplitMenuEOService.java   |   2 +-
 .../impl/SarFileSplitMenuEOServiceImpl.java   | 103 ++++++++++--------
 6 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
index 375320a9..a1f526e0 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java
@@ -72,8 +72,9 @@ public class SarFileSplitMenuEOController extends JeroController<SarFileSplitMen
     @GetMapping("/updateMenuLevel")
 //    @RequiresPermissions("split:sarFileSplitMenu:updateMenuLevel")
     public Result<SarFileSplitMenuEO> updateMenuLevel(@ApiParam(value = "要移动的节点id")String sourceId,
-                                                      @ApiParam(value = "要移动到的节点id")String targetId) {
-        sarFileSplitMenuEOService.updateMenuLevel(sourceId, targetId);
+                                                      @ApiParam(value = "要移动到的节点id")String targetId,
+                                                      @ApiParam(value = "序号")Long displaySeq) {
+        sarFileSplitMenuEOService.updateMenuLevel(sourceId, targetId, displaySeq);
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java
index ab18dd8e..4cb1d34f 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java
@@ -1,5 +1,6 @@
 package com.jero.modules.split.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +17,7 @@ import java.util.List;
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
 @Data
+@TableName("SAR_FILE_SPLIT_MENU")
 public class SarFileSplitMenuEO implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java b/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java
index 5e0246d5..9b509d04 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java
@@ -74,7 +74,7 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper<SarFileSplitMenuEO>
 
     SarFileSplitMenuEO findById(String id);
 
-    SarFileSplitMenuEO findLastByParentId(String parentId);
+    List<SarFileSplitMenuEO> findLastByParentId(@Param("parentId") String parentId, @Param("displaySeq") Long displaySeq);
 
     List<SarFileSplitMenuEO> queryByGTDisplaySeq(@Param("infoId") String infoId, @Param("displaySeq") Long displaySeq);
 
diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
index b482ff89..8d447559 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
@@ -373,9 +373,10 @@
 
   <select id="findLastByParentId" resultMap="BaseResultMap">
       select * from SAR_FILE_SPLIT_MENU
-      where parent_id = #{parentId} AND valid_flag = '0'
+      where parent_id = #{parentId}
+      AND valid_flag = '0'
+      and display_seq > #{displaySeq}
       order by display_seq desc
-      limit 1
     </select>
 
   <select id="queryByGTDisplaySeq" resultMap="BaseResultMap">
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java
index 5d6af30b..f7d65627 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java
@@ -58,5 +58,5 @@ public interface ISarFileSplitMenuEOService extends IService<SarFileSplitMenuEO>
 
     Result moveUpOrDown(JSONObject json);
 
-    void updateMenuLevel(String sourceId, String targetId);
+    void updateMenuLevel(String sourceId, String targetId, Long displaySeq);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index 8b13aa3f..7df89e7b 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -374,50 +374,63 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
     }
 
     @Override
-    public void updateMenuLevel(String sourceId, String targetId) {
-        // 要移动的节点信息
-        SarFileSplitMenuEO sarFileSplitMenuEO1 = baseMapper.findById(sourceId);
+    public void updateMenuLevel(String sourceIds, String parentId, Long displaySeq) {
         // 要移动到的节点信息
-        SarFileSplitMenuEO sarFileSplitMenuEO2 = baseMapper.findById(targetId);
+        SarFileSplitMenuEO parentMenu = baseMapper.findById(parentId);
         // 获取要移动到的层级的最后一个 的排序值
-        SarFileSplitMenuEO lastMenu = getLastMenu(sarFileSplitMenuEO2.getId());
-        if (Objects.isNull(lastMenu)){
-            lastMenu = sarFileSplitMenuEO2;
-        }
-
-        // 要移动的节点所有子集（包括本身）
-        List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
-        sarFileSplitMenuEO1List.add(sarFileSplitMenuEO1);
-        List<SarFileSplitMenuEO> allList = new ArrayList<>();
-        getChildren(allList, sarFileSplitMenuEO1List);
-        List<String> idlist = new ArrayList<>();
-
-        // 更新要移动节点及其子集的排序
-        for (int i = 0; i <allList.size(); i++) {
-            SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
-            if (!Objects.equals(sarFileSplitMenuEO.getId(), lastMenu.getId())){
-                sarFileSplitMenuEO.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
-            }
-            idlist.add(sarFileSplitMenuEO.getId());
+        List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
+        List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
+        int size = sourceIdList.size();
+        for (SarFileSplitMenuEO sarFileSplitMenuEO : lastMenuList) {
+            Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
+            sarFileSplitMenuEO.setDisplaySeq(displaySeq1+size);
             baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
         }
-        Long displaySeq = allList.get(allList.size() - 1).getDisplaySeq();
-
-        // 更新 大于 要移动到节点最后节点 的节点排序值
-        List<SarFileSplitMenuEO> sarFileSplitMenuEOList =
-                baseMapper.queryByGTDisplaySeq(sarFileSplitMenuEO1.getInfoId(), lastMenu.getDisplaySeq());
-        sarFileSplitMenuEOList = sarFileSplitMenuEOList.stream()
-                .filter(v -> !idlist.contains(v.getId())).collect(Collectors.toList());
-        for (int i = 0; i < sarFileSplitMenuEOList.size(); i++) {
-            // 更新排序
-            SarFileSplitMenuEO fileSplitMenuEO = sarFileSplitMenuEOList.get(i);
-            fileSplitMenuEO.setDisplaySeq(displaySeq + i + 1);
-            baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO);
+        //this.updateBatchById(lastMenuList);
+        List<SarFileSplitMenuEO> updateList = new ArrayList<>();
+        for (int i = 0; i < sourceIdList.size(); i++) {
+            String sourceId = sourceIdList.get(i);
+            // 要移动的节点信息
+            SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
+            sarFileSplitMenuEO.setParentId(parentId);
+            sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
+            updateList.add(sarFileSplitMenuEO);
+            baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
         }
-
-        // 更新要移动节点的parentId
-        sarFileSplitMenuEO1.setParentId(targetId);
-        baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO1);
+        //this.updateBatchById(updateList);
+        // 要移动的节点所有子集（包括本身）
+        //List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
+        //sarFileSplitMenuEO1List.add(sarFileSplitMenuEO1);
+        //List<SarFileSplitMenuEO> allList = new ArrayList<>();
+        //getChildren(allList, sarFileSplitMenuEO1List);
+        //List<String> idlist = new ArrayList<>();
+        //
+        //// 更新要移动节点及其子集的排序
+        //for (int i = 0; i <allList.size(); i++) {
+        //    SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
+        //    if (!Objects.equals(sarFileSplitMenuEO.getId(), lastMenu.getId())){
+        //        sarFileSplitMenuEO.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
+        //    }
+        //    idlist.add(sarFileSplitMenuEO.getId());
+        //    baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+        //}
+        //Long displaySeq = allList.get(allList.size() - 1).getDisplaySeq();
+        //
+        //// 更新 大于 要移动到节点最后节点 的节点排序值
+        //List<SarFileSplitMenuEO> sarFileSplitMenuEOList =
+        //        baseMapper.queryByGTDisplaySeq(sarFileSplitMenuEO1.getInfoId(), lastMenu.getDisplaySeq());
+        //sarFileSplitMenuEOList = sarFileSplitMenuEOList.stream()
+        //        .filter(v -> !idlist.contains(v.getId())).collect(Collectors.toList());
+        //for (int i = 0; i < sarFileSplitMenuEOList.size(); i++) {
+        //    // 更新排序
+        //    SarFileSplitMenuEO fileSplitMenuEO = sarFileSplitMenuEOList.get(i);
+        //    fileSplitMenuEO.setDisplaySeq(displaySeq + i + 1);
+        //    baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO);
+        //}
+        //
+        //// 更新要移动节点的parentId
+        //sarFileSplitMenuEO1.setParentId(parentId);
+        //baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO1);
     }
 
     private void getChildren(List<SarFileSplitMenuEO> allList, List<SarFileSplitMenuEO> sarFileSplitMenuEOList) {
@@ -430,11 +443,11 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         }
     }
 
-    public SarFileSplitMenuEO getLastMenu(String parentId) {
-        SarFileSplitMenuEO sarFileSplitMenuEO1 = baseMapper.findLastByParentId(parentId);
-        if(sarFileSplitMenuEO1 != null){
-            getLastMenu(sarFileSplitMenuEO1.getId());
-        }
-        return sarFileSplitMenuEO1;
+    public List<SarFileSplitMenuEO> getLastMenu(String parentId, Long displaySeq) {
+        List<SarFileSplitMenuEO> lastByParentId = baseMapper.findLastByParentId(parentId, displaySeq);
+        //if(sarFileSplitMenuEO1 != null){
+        //    getLastMenu(sarFileSplitMenuEO1.getId());
+        //}
+        return lastByParentId;
     }
 }