修改文档对比-全文对比接口-添加key和title

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareDetailVO.java

@@ -12,9 +12,9 @@ public class SarFileCompareDetailVO {
     private String fileNameRight;
     private String remark;
     private String comments;
-    private SarFileCompareMenuVo menuLeft;
+    private List<SarFileCompareMenuVo> menuLeft;
     private List<SarFileCompareItem> textLeft;
-    private SarFileCompareMenuVo menuRight;
+    private List<SarFileCompareMenuVo> menuRight;
     private List<SarFileCompareItem> textRight;
 
     public String getInfoId() {
@@ -73,14 +73,6 @@ public class SarFileCompareDetailVO {
         this.comments = comments;
     }
 
-    public SarFileCompareMenuVo getMenuLeft() {
-        return menuLeft;
-    }
-
-    public void setMenuLeft(SarFileCompareMenuVo menuLeft) {
-        this.menuLeft = menuLeft;
-    }
-
     public List<SarFileCompareItem> getTextLeft() {
         return textLeft;
     }
@@ -96,14 +88,6 @@ public class SarFileCompareDetailVO {
         this.textLeft.add(text);
     }
 
-    public SarFileCompareMenuVo getMenuRight() {
-        return menuRight;
-    }
-
-    public void setMenuRight(SarFileCompareMenuVo menuRight) {
-        this.menuRight = menuRight;
-    }
-
     public List<SarFileCompareItem> getTextRight() {
         return textRight;
     }
@@ -118,4 +102,34 @@ public class SarFileCompareDetailVO {
         }
         this.textRight.add(text);
     }
+
+    public List<SarFileCompareMenuVo> getMenuLeft() {
+        return menuLeft;
+    }
+
+    public void setMenuLeft(List<SarFileCompareMenuVo> menuLeft) {
+        this.menuLeft = menuLeft;
+    }
+
+    public void addMenuLeft(SarFileCompareMenuVo menu) {
+        if (this.menuLeft == null) {
+            this.menuLeft = new ArrayList<>();
+        }
+        this.menuLeft.add(menu);
+    }
+
+    public List<SarFileCompareMenuVo> getMenuRight() {
+        return menuRight;
+    }
+
+    public void setMenuRight(List<SarFileCompareMenuVo> menuRight) {
+        this.menuRight = menuRight;
+    }
+
+    public void addMenuRight(SarFileCompareMenuVo menu) {
+        if (this.menuRight == null) {
+            this.menuRight = new ArrayList<>();
+        }
+        this.menuRight.add(menu);
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java

@@ -4,11 +4,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class SarFileCompareMenuVo extends SarFileCompareMenu {
+    private String key;
+    private String title;
+
     private List<SarFileCompareMenuVo> children;
 
     public SarFileCompareMenuVo(SarFileCompareMenu menu) {
         super();
         this.setId(menu.getId());
+        this.setKey(menu.getId());
         this.setCreateBy(menu.getCreateBy());
         this.setCreateTime(menu.getCreateTime());
         this.setUpdateBy(menu.getUpdateBy());
@@ -17,6 +21,7 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu {
         this.setMenuId(menu.getMenuId());
         this.setInfoId(menu.getInfoId());
         this.setName(menu.getName());
+        this.setTitle(menu.getName());
         this.setParentId(menu.getParentId());
         this.setDisplaySeq(menu.getDisplaySeq());
         this.setLeftOrRight(menu.getLeftOrRight());
@@ -38,4 +43,20 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu {
         }
         children.add(child);
     }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java

@@ -267,14 +267,14 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
                 if (menu.getLeftOrRight().equals("LEFT")) {
                     SarFileCompareMenuVo menuLeft = new SarFileCompareMenuVo(menu);
                     menuLeft.setChildren(getMenuChildren(menuList, "LEFT", menuLeft.getMenuId()));
-                    sfVo.setMenuLeft(menuLeft);
+                    sfVo.addMenuLeft(menuLeft);
                 } else if (menu.getLeftOrRight().equals("RIGHT")) {
                     SarFileCompareMenuVo menuRight = new SarFileCompareMenuVo(menu);
                     menuRight.setChildren(getMenuChildren(menuList, "RIGHT", menuRight.getMenuId()));
-                    sfVo.setMenuRight(menuRight);
+                    sfVo.addMenuRight(menuRight);
                 }
             }
-            if (sfVo.getMenuRight() != null && sfVo.getMenuLeft() != null) {
+            if (sfVo.getMenuRight() != null && sfVo.getMenuRight().size() > 0 && sfVo.getMenuLeft() != null && sfVo.getMenuLeft().size() > 0) {
                 break;
             }
         }