xuxiaofei преди 2 години
родител
ревизия
8a24b1f50e

+ 4 - 4
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/runner/SocketRunner.java

@@ -27,14 +27,14 @@ import java.util.concurrent.*;
 public class SocketRunner implements CommandLineRunner {
 
     //地址
-    public static ConcurrentMap<String,Socket>  concurrentMap = new ConcurrentHashMap<>();
+    //public static ConcurrentMap<String,Socket>  concurrentMap = new ConcurrentHashMap<>();
     //带端口的地址
-    public static ConcurrentHashSet<String> concurrentHashSet= new ConcurrentHashSet<>();
-
+    //public static ConcurrentHashSet<String> concurrentHashSet= new ConcurrentHashSet<>();
     //黑名单
-    public static ConcurrentHashSet<String> backList= new ConcurrentHashSet<>();
+    //public static ConcurrentHashSet<String> backList= new ConcurrentHashSet<>();
 
     public static Set<String> whitelist;
+
     @Autowired
     private SocketProperties properties;
 

+ 2 - 2
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/FireLaborUtil.java

@@ -20,7 +20,7 @@ public class FireLaborUtil {
     private static final  String All_REGISTER="00 24";
 
 
-    public static final Map<String, String> statusMap = new HashMap<>();
+    private static final Map<String, String> statusMap = new HashMap<>();
     static {
         statusMap.put("00","无事件");
         statusMap.put("01","火警");
@@ -33,7 +33,7 @@ public class FireLaborUtil {
      * 静态map,用于存储 寄存器状态说明
      *
      */
-    public static final Map<Integer, String> myMap_0 = new HashMap<>();
+    private static final Map<Integer, String> myMap_0 = new HashMap<>();
     static {
         myMap_0.put(1, "01 02");
         myMap_0.put(2, "03 04");

+ 1 - 1
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/RelayUtils.java

@@ -28,7 +28,7 @@ public class RelayUtils {
 
     private static RedisService redisService = SpringUtils.getBean(RedisService.class);
 
-    public static ConcurrentMap<String, Object> concurrentMap = new ConcurrentHashMap<>();
+    private static ConcurrentMap<String, Object> concurrentMap = new ConcurrentHashMap<>();
 
     /**
      * 继电器的开和关