nsView接口增加NS标签数据

src/main/java/com/neotel/smfcore/core/device/rest/VideoController.java

@@ -2,6 +2,7 @@ package com.neotel.smfcore.core.device.rest;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.core.system.util.EquipStatusUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +28,19 @@ public class VideoController {
             String cid = params.get("cid");
             String cid = params.get("cid");
             String img = params.get("img");
             String img = params.get("img");
             updateVideo(cid,img);
             updateVideo(cid,img);
+
+            if(params.size()>2){
+                Map<String, String> data=new HashMap<>();
+                for (String key :params.keySet()){
+                    if(key.equals("cid")||key.equals("img")){
+                        continue;
+                    }
+                    data.put(key, params.get(key));
+                }
+                if(data.size()>0){
+                    EquipStatusUtil.updateData(cid,data);
+                }
+            }
         } catch (Exception e) {
         } catch (Exception e) {
 
 
             log.error("出错：", e);
             log.error("出错：", e);

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipViewController.java

@@ -133,6 +133,14 @@ public class EquipViewController {
 
 
             }
             }
         }
         }
+
+        Map<String,String> data=EquipStatusUtil.getData(equip.getCid());
+        if(data!=null){
+            dto.setPrintData(data);
+        }else {
+            data=new HashMap<>();
+            dto.setPrintData(data);
+        }
 //        if(dto.getShowLogs().size()<=0){
 //        if(dto.getShowLogs().size()<=0){
 //            EquipMsg msg=new EquipMsg();
 //            EquipMsg msg=new EquipMsg();
 //            msg.setModule("module1");
 //            msg.setModule("module1");

src/main/java/com/neotel/smfcore/core/equipment/rest/dto/NsViewDto.java

@@ -45,4 +45,8 @@ public class NsViewDto implements Serializable {
      * key=MES,value=MES最后一次对接信息：格式参考NsMesInfo
      * key=MES,value=MES最后一次对接信息：格式参考NsMesInfo
      */
      */
     private Map<String, Object> data = new HashMap<>();
     private Map<String, Object> data = new HashMap<>();
+    /**
+     * NS打印数据
+     */
+    private Map<String, String> printData = new HashMap<>();
 }
 }

src/main/java/com/neotel/smfcore/core/system/util/EquipStatusUtil.java

@@ -102,4 +102,28 @@ public class EquipStatusUtil {
         }
         }
         return lastAgvMesMap.get("");
         return lastAgvMesMap.get("");
     }
     }
+
+    public static Map<String,Map<String,String>> dataMap=new HashMap<>();
+    public static void updateData(String cid, Map<String,String> data) {
+        if (dataMap.containsKey(cid)) {
+            dataMap.remove(cid);
+        }
+        dataMap.put(cid, data);
+    }
+
+    public static Map<String,String> getData(String cid) {
+        Map<String,String> data = dataMap.getOrDefault(cid, new HashMap<>());
+
+        if (data==null||data.size() > 0) {
+            //默认查找cid_1的视频
+            String nCid=cid+"_2";
+            data = dataMap.getOrDefault(cid, new HashMap<>());
+        }
+        if (data==null||data.size() > 0) {
+            //默认查找cid_1的视频
+            String nCid=cid+"_1";
+            data = dataMap.getOrDefault(cid, new HashMap<>());
+        }
+        return data;
+    }
 }
 }

src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSCommunicator.java

@@ -77,7 +77,11 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
     public void setApiPort(String configPort) {
     public void setApiPort(String configPort) {
         TMSCommunicator.configApiPort = configPort;
         TMSCommunicator.configApiPort = configPort;
     }
     }
-
+    /**
+     * API名称
+     */
+    @Value("${api.name:}")
+    protected String apiName = "";
     @Autowired
     @Autowired
     private DataCache dataCache;
     private DataCache dataCache;
 
 
@@ -113,7 +117,13 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
         host = dataCache.getConfigCache("hanwha.host", host);
         host = dataCache.getConfigCache("hanwha.host", host);
         String webPortStr = dataCache.getConfigCache("hanwha.webPort", configWebPort);
         String webPortStr = dataCache.getConfigCache("hanwha.webPort", configWebPort);
         String apiPortStr = dataCache.getConfigCache("hanwha.apiPort", configApiPort);
         String apiPortStr = dataCache.getConfigCache("hanwha.apiPort", configApiPort);
-        if (ObjectUtil.isEmpty(host) || ObjectUtil.isEmpty(webPortStr) || ObjectUtil.isEmpty((apiPortStr))) {
+        apiName = dataCache.getConfigCache("api.name",apiName);
+
+        boolean enable=  apiName != null && apiName.equalsIgnoreCase("hanwha") ;
+        if(!enable){
+            log.info("apiName:" + apiName+"，不需要连接");
+        }
+        else if (ObjectUtil.isEmpty(host) || ObjectUtil.isEmpty(webPortStr) || ObjectUtil.isEmpty((apiPortStr))) {
             log.info("配置不完整，不需要连接");
             log.info("配置不完整，不需要连接");
         } else {
         } else {
             webPort = Integer.parseInt(webPortStr);
             webPort = Integer.parseInt(webPortStr);