处理问题

basic-interface/src/main/java/ink/wgink/interfaces/menu/IMenuBaseService.java

@@ -1,6 +1,8 @@
 package ink.wgink.interfaces.menu;
 
 import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.bos.menu.SaveMenuBO;
+import ink.wgink.pojo.bos.menu.UpdateMenuBO;
 import ink.wgink.pojo.dtos.ZTreeDTO;
 import ink.wgink.pojo.dtos.menu.MenuDTO;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -33,7 +35,24 @@ public interface IMenuBaseService {
      * @param menuUrl
      * @return
      */
-    String saveAndReturnIdByParentIdAndNameAndUrl(String menuParentId, String menuName, String menuUrl);
+    String saveAndReturnId(SaveMenuBO saveMenuBO);
+
+    /**
+     * 菜单删除
+     *
+     * @param ids
+     * @return
+     */
+    void remove(List<String> ids);
+
+    /**
+     * 修改
+     *
+     * @param menuId
+     * @param updateMenuBO
+     * @return
+     */
+    void update(String menuId, UpdateMenuBO updateMenuBO);
 
     /**
      * 菜单详情

basic-pojo/src/main/java/ink/wgink/pojo/bos/menu/SaveMenuBO.java

@@ -0,0 +1,22 @@
+package ink.wgink.pojo.bos.menu;
+
+/**
+ * @ClassName: SaveMenuBO
+ * @Description: 保存菜单
+ * @Author: wanggeng
+ * @Date: 2022/6/16 09:44
+ * @Version: 1.0
+ */
+public class SaveMenuBO extends UpdateMenuBO {
+
+    private String menuParentId;
+
+    public String getMenuParentId() {
+        return menuParentId == null ? "" : menuParentId.trim();
+    }
+
+    public void setMenuParentId(String menuParentId) {
+        this.menuParentId = menuParentId;
+    }
+
+}

basic-pojo/src/main/java/ink/wgink/pojo/bos/menu/UpdateMenuBO.java

@@ -0,0 +1,48 @@
+package ink.wgink.pojo.bos.menu;
+
+/**
+ * @ClassName: SaveMenuBO
+ * @Description: 保存菜单
+ * @Author: wanggeng
+ * @Date: 2022/6/16 09:44
+ * @Version: 1.0
+ */
+public class UpdateMenuBO {
+
+    private String menuName;
+    private String menuUrl;
+    private String menuOrder;
+    private String menuStatus;
+
+    public String getMenuName() {
+        return menuName == null ? "" : menuName.trim();
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public String getMenuUrl() {
+        return menuUrl == null ? "" : menuUrl.trim();
+    }
+
+    public void setMenuUrl(String menuUrl) {
+        this.menuUrl = menuUrl;
+    }
+
+    public String getMenuOrder() {
+        return menuOrder == null ? "" : menuOrder.trim();
+    }
+
+    public void setMenuOrder(String menuOrder) {
+        this.menuOrder = menuOrder;
+    }
+
+    public String getMenuStatus() {
+        return menuStatus == null ? "" : menuStatus.trim();
+    }
+
+    public void setMenuStatus(String menuStatus) {
+        this.menuStatus = menuStatus;
+    }
+}

module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java

@@ -16,6 +16,7 @@ import ink.wgink.module.form.service.design.IFormFieldService;
 import ink.wgink.module.form.service.design.IFormService;
 import ink.wgink.module.form.service.report.IFormReportService;
 import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.bos.menu.SaveMenuBO;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.map.HashMapUtil;
@@ -237,7 +238,13 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService
             throw new SearchException("表单不存在");
         }
         String menuUrl = String.format("/route/form-report/list/code/%s/version/%d/true", formPO.getFormCode(), formPO.getFormVersion());
-        menuBaseService.saveAndReturnIdByParentIdAndNameAndUrl(menuParentId, formPO.getFormName(), menuUrl);
+        SaveMenuBO saveMenuBO = new SaveMenuBO();
+        saveMenuBO.setMenuParentId(menuParentId);
+        saveMenuBO.setMenuName(formPO.getFormName());
+        saveMenuBO.setMenuUrl(menuUrl);
+        saveMenuBO.setMenuStatus("0");
+        saveMenuBO.setMenuOrder("9999");
+        menuBaseService.saveAndReturnId(saveMenuBO);
     }
 
     @Override

service-menu/src/main/java/ink/wgink/module/menu/service/IMenuService.java

@@ -65,14 +65,6 @@ public interface IMenuService extends IMenuBaseService {
      */
     void update(String token, String menuId, MenuVO menuVO);
 
-    /**
-     * 菜单删除
-     *
-     * @param ids
-     * @return
-     */
-    void remove(List<String> ids);
-
     /**
      * 删除菜单
      *

service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java

@@ -10,6 +10,8 @@ import ink.wgink.module.menu.dao.IMenuDao;
 import ink.wgink.module.menu.pojo.vos.MenuVO;
 import ink.wgink.module.menu.service.IMenuService;
 import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.bos.menu.SaveMenuBO;
+import ink.wgink.pojo.bos.menu.UpdateMenuBO;
 import ink.wgink.pojo.dtos.ZTreeDTO;
 import ink.wgink.pojo.dtos.menu.MenuDTO;
 import ink.wgink.pojo.result.SuccessResultList;
@@ -17,6 +19,7 @@ import ink.wgink.util.ArrayListUtil;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.map.HashMapUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,21 +41,6 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
     @Autowired(required = false)
     private IMongoMenuService mongoMenuService;
 
-    @Override
-    public String saveAndReturnIdByParentIdAndNameAndUrl(String menuParentId, String menuName, String menuUrl) {
-        MenuVO menuVO = new MenuVO();
-        menuVO.setMenuParentId(menuParentId);
-        menuVO.setMenuName(menuName);
-        menuVO.setMenuSummary(menuName);
-        menuVO.setMenuUrl(menuUrl);
-        menuVO.setMenuType(1);
-        menuVO.setMenuStatus(0);
-        menuVO.setMenuIcon("fa fa-list");
-        menuVO.setOpenType(1);
-        menuVO.setMenuOrder("1000");
-        return saveAndReturnId(menuVO);
-    }
-
     @Override
     public MenuDTO get(Map<String, Object> params) {
         return menuDao.get(params);
@@ -168,11 +156,28 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
         return menuId;
     }
 
+    @Override
+    public String saveAndReturnId(SaveMenuBO saveMenuBO) {
+        MenuVO menuVO = new MenuVO();
+        BeanUtils.copyProperties(saveMenuBO, menuVO);
+        menuVO.setMenuType(1);
+        menuVO.setMenuIcon("fa fa-list");
+        menuVO.setOpenType(1);
+        return saveAndReturnId(menuVO);
+    }
+
     @Override
     public void remove(List<String> ids) {
         remove(null, ids);
     }
 
+    @Override
+    public void update(String menuId, UpdateMenuBO updateMenuBO) {
+        MenuVO menuVO = new MenuVO();
+        BeanUtils.copyProperties(updateMenuBO, menuVO);
+        update(menuId, menuVO);
+    }
+
     @Override
     public void remove(String token, List<String> ids) {
         Map<String, Object> params = getHashMap(2);