1.设备第一次上传过来,展示对应的菜单(料架和锡膏料仓)

zshaohui
Commit a9280946 由 zshaohui 编写于 2024-01-25 15:16:03 +0800
src/main/java/com/neotel/smfcore/common/init/MenuInit.java
src/main/java/com/neotel/smfcore/core/system/util/DevicesStatusUtil.java
--- a/src/main/java/com/neotel/smfcore/common/init/MenuInit.java
查看文件 @a928094
+++ b/src/main/java/com/neotel/smfcore/common/init/MenuInit.java
查看文件 @a928094
@@ -41,7 +41,12 @@ public class MenuInit {
    /**
     * 锡膏料仓展示菜单
     */
-    private static String SP_SHOW_MENU = "sp";
+    public static String SP_SHOW_MENU = "sp";
+    /**
+     * 料架展示菜单,包括nl,nlp,nlm,nls
+     */
+    public static String NL_SHOW_MENU = "nl";
    private static Map<String, Menu> allMenuMap = new HashMap<>();
@@ -115,7 +120,7 @@ public class MenuInit {
        addDefaultFunctionMenu(-1,null,"Neo Ai","neoai","neoai/index","neoai");
-        //Mimo临时看板
+        //Mimo看板
        addDefaultFunctionMenu(0,null,"SMD BOX MIMO","SMDBOXMIMO", "smdBoxMimo/index","smdMimo");
        Menu boardMap = Menu.CreatePMenu("仪表盘", 0, "dashBoard", "kanban", null);
@@ -127,7 +132,7 @@ public class MenuInit {
        addDefaultFunctionMenu(1, boardMap, "仪表盘2", "eleckanban", "eleckanban/index", "kanban");
        //设备看板
-        addDefaultFunctionMenu(1,null,"设备看板","lockMaterial", "lockMaterial/material/index","kanban",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(1,null,"设备互联","lockMaterial", "lockMaterial/material/index","kanban",DEFAULT_SHOW_MENU);
        //设备互联
        addDefaultFunctionMenu(2,null,"设备互联","equipmentView", "neolight/equipmentView/index","sKanban");
@@ -193,7 +198,7 @@ public class MenuInit {
        addDefaultFunctionMenu(70, pMenuReport, "锁定物料", "lockMaterials", "system/lockMaterials/index",  "lockMaterials");
        addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutData", "neolight/inOutData/index", "outPut");
        //新的出入库报表
-        addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutDataCount", "neolight/inOutDataCount/index", "outPut");
+        addDefaultFunctionMenu(71, pMenuReport, "出入库", "inOutDataCount", "neolight/inOutDataCount/index", "outPut",DEFAULT_SHOW_MENU);
        addDefaultFunctionMenu(72, pMenuReport,"库存", "inventory", "neolight/inventory/index", "inventory");
        addDefaultFunctionMenu(73, pMenuReport,"温湿度", "humiture", "humiture/humitureReport/index", "humiture");
        addDefaultFunctionMenu(73, pMenuReport,"温湿度", "spHumiture", "humiture/spHumitureReport/index", "humiture");
@@ -203,7 +208,7 @@ public class MenuInit {
        addDefaultFunctionMenu(81,guanceMenu, "物料追踪", "materialChart", "neolight/materialChart/index", "maChart");
        //物联网：共享文件夹
-        Menu pMenuWulian = Menu.CreatePMenu("物联网", 11, "internet", "interMenu",null);
+        //Menu pMenuWulian = Menu.CreatePMenu("物联网", 11, "internet", "interMenu",null);
        //设置：料仓管理，菜单管理
@@ -213,10 +218,10 @@ public class MenuInit {
        addDefaultFunctionMenu(103, poutSet, "菜单管理", "menu", "system/menu/index", "menu");
 //        Menu sysSetting = new Menu(, "barcode", "条码设置", "barcodeSetting", "system/barcodeSetting/index", "database");
 //        Menu outSet = new Menu(, "outSetting", "出库策略", "outSetting", "system/outSetting/index", "outSet");
-        addDefaultFunctionMenu(104,poutSet, "系统设置", "sysSetting", "system/sysSetting/index", "sysSet");
+        addDefaultFunctionMenu(104,poutSet, "系统设置", "sysSetting", "system/sysSetting/index", "sysSet",DEFAULT_SHOW_MENU);
        addDefaultFunctionMenu(105,poutSet, "资源翻译", "translation", "system/translation/index", "translation");
 //        Menu orderSet = new Menu(, "orderSetting", "工单设置", "orderSetting", "system/orderSetting/index", "sysSet");
-        addDefaultFunctionMenu(106,poutSet, "料架设置", "shelfSetting", "system/shelfSetting/index", "translation");
+        addDefaultFunctionMenu(106,poutSet, "料架设置", "shelfSetting", "system/shelfSetting/index", "translation",NL_SHOW_MENU);
        //用户管理：用户管理，角色管理

--- a/src/main/java/com/neotel/smfcore/core/system/util/DevicesStatusUtil.java
查看文件 @a928094
+++ b/src/main/java/com/neotel/smfcore/core/system/util/DevicesStatusUtil.java
查看文件 @a928094
@@ -3,13 +3,19 @@ package com.neotel.smfcore.core.system.util;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.collect.Maps;
+import com.neotel.smfcore.common.init.MenuInit;
 import com.neotel.smfcore.common.utils.SecurityUtils;
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.dashboard.bean.dto.box.MesInfoDto;
 import com.neotel.smfcore.core.device.bean.MsgInfo;
 import com.neotel.smfcore.core.device.bean.StatusBean;
+import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.message.enums.MessageType;
 import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
+import com.neotel.smfcore.core.storage.service.po.Storage;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,8 +27,24 @@ import java.util.concurrent.ConcurrentHashMap;
 * Created by sunke on 2021/8/4.
 */
 @Slf4j
+@Service
 public class DevicesStatusUtil {
+    private static DataCache dataCache;
+    @Autowired
+    private void setDataCache(DataCache cache) {
+        this.dataCache = cache;
+    }
+    private static MenuInit menuInit;
+    @Autowired
+    private void setMenuInit(MenuInit init) {
+        DevicesStatusUtil.menuInit = init;
+    }
    /**
     * 状态 map,key为 cid value 为状态 Bean
     */
@@ -58,6 +80,21 @@ public class DevicesStatusUtil {
     * 更新设备状态信息
     */
    public static void updateStatusBean(StatusBean statusBean) {
+        String cid = statusBean.getCid();
+        if (statusMap.get(cid) == null) {
+            Storage storage = dataCache.getStorage(cid);
+            if (storage != null) {
+                String menuClient = "";
+                if (storage.isNLShelf() || storage.isShelf() || storage.isNLMShelf() || storage.isNLPShelf()) {
+                    menuClient = MenuInit.NL_SHOW_MENU;
+                } else if (storage.isSolderPaste()) {
+                    menuClient = MenuInit.SP_SHOW_MENU;
+                }
+                if (StringUtils.isNotBlank(menuClient)) {
+                    menuInit.showMenu(menuClient);
+                }
+            }
+        }
        statusMap.put(statusBean.getCid(), statusBean);
    }
 //