增加帮助菜单

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -56,19 +56,19 @@ public class DataInitManager {
             if (admin == null) {
 
                 log.info("开始创建默认菜单...");
-                Set<String> menuIdSet = MenuInitNew() ;
+                Set<String> menuIdSet = MenuInitNew();
 
 //                Group group=new Group("未分组");
 //                group=groupManager.save(group);
 //                log.info("创建默认组：" + group.toString());
-                Set<String> groupIds= new HashSet<>();
+                Set<String> groupIds = new HashSet<>();
 //                groupIds.add(group.getId());
 
-                Role role = new Role(menuIdSet,"admin","管理员");
-                role= roleManager.save(role);
+                Role role = new Role(menuIdSet, "admin", "管理员");
+                role = roleManager.save(role);
                 log.info("创建默认角色：" + role.toString());
 
-                admin = new User( userName, "admin@qq.com","zh",role.getId(), "$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds,"" );
+                admin = new User(userName, "admin@qq.com", "zh", role.getId(), "$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "");
                 userManager.save(admin);
                 log.info("创建默认用户：" + admin.toString());
 
@@ -78,10 +78,19 @@ public class DataInitManager {
                 log.info("初始化环境完成...");
             }
 
-            List<Menu> menus=menuManager.findByQuery(new Query(Criteria.where("path").ne("")));
-            for (Menu me:menus
+            List<Menu> helpMenus = menuManager.findByQuery(new Query(Criteria.where("title").is("帮助")));
+            if (helpMenus == null || helpMenus.size() <= 0) {
+                Menu helpAbout = Menu.CreatePMenu("帮助", 30, "help", 2, "help");
+                Menu instruMenu = new Menu(new ArrayList<Menu>(), 1, "instruction", "说明书", 1, "instruction", "system/instruction/index", "", 0, "aboutBook");
+                Menu aboutMenu = new Menu(new ArrayList<Menu>(), 1, "about", "关于", 1, "about", "system/about/index", "", 0, "message");
+                createMenus(helpAbout, instruMenu, aboutMenu);
+            }
+
+
+            List<Menu> menus = menuManager.findByQuery(new Query(Criteria.where("path").ne("")));
+            for (Menu me : menus
             ) {
-                if(me.getTitleKey()==null|| me.getTitleKey()==""){
+                if (me.getTitleKey() == null || me.getTitleKey() == "") {
                     me.setTitleKey(me.getPath());
                     menuManager.saveMenu(me);
                 }
@@ -161,7 +170,7 @@ public class DataInitManager {
         String[] subPers = defaultMenus.get(per);
         if (subPers.length <= 0) {
 //            subPers = new String[]{per + ":edit", per + ":del", per + ":add"};
-            subPers = new String[]{per };
+            subPers = new String[]{per+":manager" };
         }
         for (String subPer :
                 subPers) {
@@ -221,6 +230,12 @@ public class DataInitManager {
 
         menus.addAll(createMenus(pMenuUser, menuUser, menuRole));
 
+        Menu helpAbout = Menu.CreatePMenu("帮助", 30, "help", 2, "help");
+        Menu instruMenu = new Menu(new ArrayList<Menu>(), 1, "instruction", "说明书", 1, "instruction", "system/instruction/index", "", 0, "aboutBook");
+        Menu aboutMenu = new Menu(new ArrayList<Menu>(), 1, "about", "关于", 1, "about", "system/about/index", "", 0, "message");
+
+        menus.addAll(createMenus(helpAbout,instruMenu,aboutMenu));
+
         Set<String> menuIdSet = new HashSet<String>() {};
         for (Menu menu : menus) {
             log.info("创建默认菜单：" + menu.toString());

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -155,9 +155,9 @@ public class BoxKanbanController {
                     statusOk = true;
                 }
             } else {
-                if (datalog.getStatus().equals(OP_STATUS.WAIT.name()) || datalog.getStatus().equals(OP_STATUS.FINISHED.name())) {
+//                if (datalog.getStatus().equals(OP_STATUS.WAIT.name()) || datalog.getStatus().equals(OP_STATUS.FINISHED.name())) {
                     statusOk = true;
-                }
+//                }
             }
             if (!statusOk) {
                 continue;

src/main/java/com/neotel/smfcore/security/rest/RoleController.java

@@ -123,18 +123,19 @@ public class RoleController {
         if (resources.getId() == null) {
             throw new ValidateException("smfcode.valueCanotNull","{0}不能为空",new String[]{"ID"} );
         }
-        Role role = roleManager.get(resources.getId());
-        //判断ID是否存在
-
-        Set<String> menuIds=resources.getMenus();
-
-        Query query=new Query(Criteria.where("id").in(menuIds));
-        List<Menu> menus=menuManager.findByQuery(query);
-        if(menus==null&&(menus.size()!=menuIds.size())){
-            throw new ValidateException("smfcode.menuNotExist","菜单{0}不存在",new String[]{"ID"} );
-        }
-        roleManager.updateMenu(resources);
-        return new ResponseEntity<>(HttpStatus.OK);
+        throw new ValidateException("smfcode.valueCanotNull","{0}不能为空",new String[]{"ID"} );
+//        Role role = roleManager.get(resources.getId());
+//        //判断ID是否存在
+//
+//        Set<String> menuIds=resources.getMenus();
+//
+//        Query query=new Query(Criteria.where("id").in(menuIds));
+//        List<Menu> menus=menuManager.findByQuery(query);
+//        if(menus==null&&(menus.size()!=menuIds.size())){
+//            throw new ValidateException("smfcode.menuNotExist","菜单{0}不存在",new String[]{"ID"} );
+//        }
+//        roleManager.updateMenu(resources);
+//        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @ApiOperation("删除角色")