通道

wps-biz/src/main/java/com/jiayue/biz/conf/Channel.java

@@ -76,8 +76,11 @@ public class Channel {
     public void restartTunnel() {
         List<TunnelInfo> tunnelInfoList = tunnelInfoService.lambdaQuery().eq(TunnelInfo::getStatus, "0").list();
         for (TunnelInfo tunnelInfo : tunnelInfoList) {
-            ModbusMaster master = start(tunnelInfo);
-            masterMap.put(tunnelInfo.getId(), master);
+            if(masterMap.get(tunnelInfo.getId()) == null){
+                ModbusMaster master = start(tunnelInfo);
+                masterMap.put(tunnelInfo.getId(), master);
+            }
+
         }
     }
 
@@ -178,10 +181,10 @@ public class Channel {
             environmentalDataService.insertOne(packageData(weatherLookList.get(0).getWeatherLookNo(), pointMap, dateTime));
         }
         if (tunnelInfoForIdList.size() > 0) {
-            for (TunnelInfo tunnelInfo : tunnelInfoForIdList) {
-                this.stop(tunnelInfo.getId());
-                log.info("{}通道异常，已关闭", tunnelInfo.getTunnelName());
-            }
+//            for (TunnelInfo tunnelInfo : tunnelInfoForIdList) {
+//                this.stop(tunnelInfo.getId());
+//                log.info("{}通道异常，已关闭", tunnelInfo.getTunnelName());
+//            }
             tunnelInfoService.updateBatchById(tunnelInfoForIdList);
         }
 

wps-biz/src/main/java/com/jiayue/biz/service/impl/TunnelInfoServiceImpl.java

@@ -50,7 +50,7 @@ public class TunnelInfoServiceImpl extends ServiceImpl<TunnelInfoMapper, TunnelI
      * @return true/false
      */
     public boolean addTunnelForMasterMap(TunnelInfo tunnelInfo) {
-        channel.addMasterMap(tunnelInfo);
+//        channel.addMasterMap(tunnelInfo);
         return this.save(tunnelInfo);
 
     }