优化网卡名称变更处理

增加非saas平台拨号数据处理
优化详情信息

tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmNetworkInterfaceChild.java

@@ -71,4 +71,7 @@ public class RmNetworkInterfaceChild extends BaseEntity
     /** 是否为新的(0否 1是) */
     @Excel(name = "是否为新的(0否 1是)")
     private Integer newFlag;
+    /** 是否连通外网(0否，1是） */
+    @Excel(name = "是否连通外网(0否，1是）")
+    private String status;
 }

tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmPppoeConfigSub.java

@@ -42,6 +42,8 @@ public class RmPppoeConfigSub extends BaseEntity
     private String ipv4Gateway;
     /** 状态(0未连通，1连通） */
     private String status;
+    /** 虚拟网卡连通状态 */
+    private String virStatus;
     /** 上报带宽 */
     private BigDecimal bandwidthResult;
     /** MAC地址 */

tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/MessageHandler.java

@@ -25,7 +25,6 @@ import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.SessionCallback;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -1279,6 +1278,7 @@ public class MessageHandler {
         networkInterface.setProvince(networkInfo.getProvince());
         networkInterface.setPublicIp(networkInfo.getPublicIp());
         networkInterface.setInterfaceType(networkInfo.getType());
+        networkInterface.setStatus(networkInfo.getStatus());
     }
 
     /**

tongran-rocketmq/src/main/java/com/tongran/rocketmq/mapper/InitialSystemOtherCollectDataMapper.java

@@ -1,7 +1,6 @@
 package com.tongran.rocketmq.mapper;
 
 import com.tongran.rocketmq.domain.InitialSystemOtherCollectData;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -77,8 +76,8 @@ public interface InitialSystemOtherCollectDataMapper
     int deleteInitialSystemOtherCollectData(InitialSystemOtherCollectData deleteData);
     /**
      * 获取总内存
-     * @param clientId
+     * @param otherCollectData
      * @return
      */
-    String getMemTotalSize(@Param("clientId") String clientId);
+    String getMemTotalSize(InitialSystemOtherCollectData otherCollectData);
 }

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java

@@ -3,6 +3,7 @@ package com.tongran.rocketmq.service.impl;
 import com.tongran.common.core.utils.*;
 import com.tongran.rocketmq.domain.InitialBandwidthTraffic;
 import com.tongran.rocketmq.domain.InitialCpuInfo;
+import com.tongran.rocketmq.domain.InitialSystemOtherCollectData;
 import com.tongran.rocketmq.domain.RmNetworkInterfaceChild;
 import com.tongran.rocketmq.mapper.InitialBandwidthTrafficMapper;
 import com.tongran.rocketmq.mapper.InitialCpuInfoMapper;
@@ -610,7 +611,10 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf
             sppedMsg = new InitialBandwidthTraffic();
         }
         resultMap.put("speed", sppedMsg.getSpeed());
-        String memTotalSize = initialSystemOtherCollectDataMapper.getMemTotalSize(initialBandwidthTraffic.getClientId());
+        InitialSystemOtherCollectData memQuery = new InitialSystemOtherCollectData();
+        memQuery.setClientId(initialBandwidthTraffic.getClientId());
+        memQuery.setTableName(TableSubUtil.getTableName(DateUtils.getNowDate(), "initial_system_other_collect_data"));
+        String memTotalSize = initialSystemOtherCollectDataMapper.getMemTotalSize(memQuery);
         resultMap.put("memTotalSize", memTotalSize);
         // 获取cpu数量
         InitialCpuInfo cpuInfo = initialCpuInfoMapper.getCpuInfoByClientId(initialBandwidthTraffic.getClientId());

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmPppoeConfigMainServiceImpl.java

@@ -48,6 +48,13 @@ public class RmPppoeConfigMainServiceImpl implements IRmPppoeConfigMainService
         RmPppoeConfigSub rmPppoeConfigSub = new RmPppoeConfigSub();
         rmPppoeConfigSub.setClientId(rmPppoeConfigMain.getClientId());
         List<RmPppoeConfigSub> subList = rmPppoeConfigSubMapper.selectRmPppoeConfigSubList(rmPppoeConfigSub);
+        if(subList != null && !subList.isEmpty()){
+            for (RmPppoeConfigSub pppoeConfigSub : subList) {
+                if(pppoeConfigSub.getStatus() == null){
+                    pppoeConfigSub.setStatus(pppoeConfigSub.getVirStatus());
+                }
+            }
+        }
         pppoeConfigMain.setSubList(subList);
         return pppoeConfigMain;
     }