修改条形码菜单。增加物联网菜单。

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

@@ -118,50 +118,52 @@ public class DataInitManager {
 
     private int sortValue=0;
     private List<Menu> createMenus(Menu pMenu,Menu... subMenus) {
-
         List<Menu> list = new ArrayList<Menu>();
-        sortValue++;
-        pMenu.setSubCount(subMenus.length);
-        pMenu.setMenuSort(sortValue * 10);
-        if(pMenu.getPath().isEmpty()){
-            pMenu.setPath("sys-"+sortValue*10);
-        }
+        try {
+            sortValue++;
+            pMenu.setSubCount(subMenus.length);
+            pMenu.setMenuSort(sortValue * 10);
+            if (pMenu.getPath().isEmpty()) {
+                pMenu.setPath("sys-" + sortValue * 10);
+            }
 
-        pMenu = menuManager.saveMenu(pMenu);
-        list.add(pMenu);
+            pMenu = menuManager.saveMenu(pMenu);
+            list.add(pMenu);
 //        list.addAll(createSubPerMenus(pMenu));
-        if (subMenus.length > 0) {
-            int i = 0;
+            if (subMenus.length > 0) {
+                int i = 0;
 
-            for (Menu subm : subMenus
-            ) {
-                List<Menu> childMenus=new ArrayList<>();
-                if(subm.getChildren()!=null)
-                {
-                    childMenus=new ArrayList<>(subm.getChildren()) ;
-                }
+                for (Menu subm : subMenus
+                ) {
+                    List<Menu> childMenus = new ArrayList<>();
+                    if (subm.getChildren() != null) {
+                        childMenus = new ArrayList<>(subm.getChildren());
+                    }
 
-                i++;
-                int subSort = sortValue * 10 + i;
-                subm.setMenuSort(subSort);
-                subm.setSubCount(childMenus.size());
-                subm.setPid(pMenu.getId());
-                subm.setChildren(new ArrayList<>());
-                subm=menuManager.saveMenu(subm);
-                list.add(subm);
+                    i++;
+                    int subSort = sortValue * 10 + i;
+                    subm.setMenuSort(subSort);
+                    subm.setSubCount(childMenus.size());
+                    subm.setPid(pMenu.getId());
+                    subm.setChildren(new ArrayList<>());
+                    subm = menuManager.saveMenu(subm);
+                    list.add(subm);
 //                list.addAll(createSubPerMenus(subm));
 
-                for (Menu childMenu :childMenus){
-                    i++;
-                      subSort = sortValue * 10 + i;
-                    childMenu.setMenuSort(subSort);
-                    childMenu.setSubCount(0);
-                    childMenu.setPid(subm.getId());
-                    childMenu.setChildren(new ArrayList<>());
-                    childMenu=menuManager.saveMenu(childMenu);
-                    list.add(childMenu);
+                    for (Menu childMenu : childMenus) {
+                        i++;
+                        subSort = sortValue * 10 + i;
+                        childMenu.setMenuSort(subSort);
+                        childMenu.setSubCount(0);
+                        childMenu.setPid(subm.getId());
+                        childMenu.setChildren(new ArrayList<>());
+                        childMenu = menuManager.saveMenu(childMenu);
+                        list.add(childMenu);
+                    }
                 }
             }
+        } catch (Exception ex) {
+            log.error("创建菜单【" + pMenu.getTitle() + "】及其子菜单时出错：" + ex.toString());
         }
         return list;
     }
@@ -203,10 +205,10 @@ public class DataInitManager {
         //设备看板
         Menu menukanban = new Menu(new ArrayList<Menu>(), 1, "boxkanban", "设备看板", 1, "lockMaterial", "lockMaterial/material/index", "", 0, "kanban");
         menus.addAll(createMenus(menukanban));
-        //料架分组
-        Menu menuShelf = new Menu(new ArrayList<Menu>(), 1, "sensorShelf", "料架分组", 1, "lightGroup", "neolight/lightGroup/index", "", 0, "neo1");
-        menuShelf.setHidden(true);
-        menus.addAll(createMenus(menuShelf));
+//        //料架分组
+//        Menu menuShelf = new Menu(new ArrayList<Menu>(), 1, "sensorShelf", "料架分组", 1, "lightGroup", "neolight/lightGroup/index", "", 0, "neo1");
+//        menuShelf.setHidden(true);
+//        menus.addAll(createMenus(menuShelf));
 
         //物料管理：工单出库，查找出库（UID出库，PN出库），物料标签，料盒操作，出库策略，工单设置
         Menu poutOut = Menu.CreatePMenu("物料管理", 20, "order", 2, "workOrder");
@@ -222,14 +224,14 @@ public class DataInitManager {
 //        Menu manualOut = new Menu(new ArrayList<Menu>(), 1, "manualOut", "手动出库", 1, "manualOut", "neolight/manualOut/index", "", 0, "export1");
         Menu materialBox = new Menu(new ArrayList<Menu>(), 1, "materialBox", "料盒操作", 1, "materialBox", "neolight/materialBox/index", "", 0, "mIbox");
         Menu outSet = new Menu(new ArrayList<Menu>(), 1, "outSetting", "出库策略", 1, "outSetting", "system/outSetting/index", "", 0, "outSet");
-        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "工单设置", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
+//        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "工单设置", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
 
         celueOut.setHidden(true);
         groupOut.setHidden(true);
         materialBox.setHidden(true);
         outSet.setHidden(true);
-        orderSet.setHidden(true);
-        menus.addAll(createMenus(poutOut, menuOrder, out,groupOut,materialBox,outSet,orderSet));
+//        orderSet.setHidden(true);
+        menus.addAll(createMenus(poutOut, menuOrder, out,groupOut,materialBox,outSet));
 
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         Menu msd = Menu.CreatePMenu("MSD管理", 20, "msd", 2, "MSD");
@@ -251,9 +253,15 @@ public class DataInitManager {
         //物料管理：元器件，条形码,条码设置
         Menu pMenuWl = Menu.CreatePMenu("档案管理", 30, "materiel ", 2, "BOM");
         Menu menucom = new Menu(new ArrayList<Menu>(), 1, "component:list", "元器件", 1, "componentParts", "parts/component/index", "", 0, "server");
-        Menu menubarcode = new Menu(new ArrayList<Menu>(), 1, "barcode:list", "条形码", 1, "barcode", "barcode/barcode/index", "", 0, "chart");
+//        Menu menubarcode = new Menu(new ArrayList<Menu>(), 1, "barcode:list", "条形码", 1, "barcode", "barcode/barcode/index", "", 0, "chart");
+//        Menu sysSetting = new Menu(new ArrayList<Menu>(), 1, "barcode", "条码设置", 1, "barcodeSetting", "system/barcodeSetting/index", "", 0, "barcode");
+//        menus.addAll(createMenus(pMenuWl, menucom, menubarcode,sysSetting));
+        menus.addAll(createMenus(pMenuWl, menucom));
+
+        Menu pMenuBarcode = Menu.CreatePMenu("条形码", 30, "barcodes ", 2, "barcodeMenu");
+        Menu menubarcode = new Menu(new ArrayList<Menu>(), 1, "barcode:list", "条码管理", 1, "barcode", "barcode/barcode/index", "", 0, "chart");
         Menu sysSetting = new Menu(new ArrayList<Menu>(), 1, "barcode", "条码设置", 1, "barcodeSetting", "system/barcodeSetting/index", "", 0, "barcode");
-        menus.addAll(createMenus(pMenuWl, menucom, menubarcode,sysSetting));
+        menus.addAll(createMenus(pMenuBarcode, menubarcode,sysSetting));
 
         //日志管理：物料日志
         Menu pMenuLog = Menu.CreatePMenu("日志管理", 30, "log", 2, "log");
@@ -269,10 +277,15 @@ public class DataInitManager {
         //可观测性：物料追踪
         Menu guanceMenu = Menu.CreatePMenu("可观测性", 30, "observability", 2, "scanKey");
         Menu zuizongMenu = new Menu(new ArrayList<Menu>(), 1, "materialChart", "物料追踪", 1, "materialChart", "neolight/materialChart/index", "", 0, "maChart");
-
         guanceMenu.setHidden(true);
         menus.addAll(createMenus(guanceMenu, zuizongMenu));
 
+        //物联网：共享文件夹
+        Menu pMenuWulian = Menu.CreatePMenu("物联网", 30, "internet", 2, "interMenu");
+        Menu orderSet = new Menu(new ArrayList<Menu>(), 1, "orderSetting", "共享文件夹", 1, "orderSetting", "system/orderSetting/index", "", 0, "sysSet");
+        orderSet.setHidden(true);
+        menus.addAll(createMenus(pMenuWulian, orderSet));
+
 
         //设置：料仓管理，菜单管理
         Menu poutSet = Menu.CreatePMenu("设置", 30, "system", 2, "system");