ddd

src/main/java/com/its/api/its/global/TbNodeManager.java

@@ -1,6 +1,5 @@
 package com.its.api.its.global;
 
-import com.its.api.its.model.dto.node.TbNodeDto;
 import com.its.api.its.model.entity.node.TbNode;
 import com.its.api.its.repository.node.TbNodeRepository;
 import lombok.Getter;
@@ -20,7 +19,7 @@ public class TbNodeManager {
 
     private final TbNodeRepository repo;
 
-    private static final ConcurrentHashMap<Long, TbNodeDto> nodeMap = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<Long, TbNode> nodeMap = new ConcurrentHashMap<>();
 
     @PostConstruct
     void init() {
@@ -31,20 +30,32 @@ public class TbNodeManager {
 
         List<TbNode> lists = repo.findAll();
         for (TbNode obj : lists) {
-            nodeMap.put(obj.getNodeId(), obj.toDto());
+            nodeMap.put(obj.getNodeId(), obj);
         }
         //log.info("=== {}", nodeMap);
     }
 
+    public static TbNode get(Long id) {
+        if (id == null) {
+            return null;
+        }
+        return nodeMap.get(id);
+    }
     public static String getNodeName(Long NODE_ID) {
-        TbNodeDto obj = nodeMap.get(NODE_ID);
+        if (NODE_ID == null) {
+            return "x";
+        }
+        TbNode obj = nodeMap.get(NODE_ID);
         if (obj != null) {
             return "[" + NODE_ID + "] " + obj.getNodeName();
         }
         return "[" + NODE_ID + "] ?";
     }
     public static String getNodeNameInteger(Long NODE_ID) {
-        TbNodeDto obj = nodeMap.get(NODE_ID);
+        if (NODE_ID == null) {
+            return "x";
+        }
+        TbNode obj = nodeMap.get(NODE_ID);
         if (obj != null) {
             return obj.getNodeName();
         }

src/main/java/com/its/api/its/global/UnitSystManager.java

@@ -36,6 +36,9 @@ public class UnitSystManager {
     }
 
     public static TbUnitSyst get(String id) {
+        if (id == null) {
+            return null;
+        }
         return objMap.get(id);
     }
 }

src/main/java/com/its/api/its/global/VdsManager.java

@@ -36,6 +36,9 @@ public class VdsManager {
     }
 
     public static TbVdsCtlr get(String id) {
+        if (id == null) {
+            return null;
+        }
         return objMap.get(id);
     }
 }

src/main/java/com/its/api/its/global/VmsManager.java

@@ -36,6 +36,9 @@ public class VmsManager {
     }
 
     public static TbVmsCtlr get(Long id) {
+        if (id == null) {
+            return null;
+        }
         return objMap.get(id);
     }
 }

src/main/java/com/its/api/its/global/VmsSymbLibManager.java

@@ -53,10 +53,16 @@ public class VmsSymbLibManager {
     }
 
     public static TbVmsSymbLib get(Integer id) {
+        if (id == null) {
+            return null;
+        }
         return lib.get(id);
     }
 
     public static TbVmsSymbIfsc getIfsc(Integer id) {
+        if (id == null) {
+            return null;
+        }
         Map<Integer, TbVmsSymbIfsc> ifscMap = ifsc.get(id);
         if (ifscMap != null) {
             return ifscMap.get(1);
@@ -65,6 +71,9 @@ public class VmsSymbLibManager {
     }
 
     public static Map<Integer, TbVmsSymbIfsc> getIfscMap(Integer id) {
+        if (id == null) {
+            return null;
+        }
         return ifsc.get(id);
     }