单网卡总流量、ipv4流量、ipv6流量合并到一个图

pppoe状态上报增加

tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/AllInterfaceNameMapper.java

@@ -92,4 +92,11 @@ public interface AllInterfaceNameMapper
      * @param records
      */
     void batchUpdate(List<AllInterfaceName> records);
+
+    /**
+     * 查询该服务器是否有子网卡
+     * @param allInterfaceName
+     * @return
+     */
+    Integer countNetChild(AllInterfaceName allInterfaceName);
 }

tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java

@@ -93,7 +93,12 @@ public class AllInterfaceNameServiceImpl implements IAllInterfaceNameService
 
             // 只设置服务器类型的businessFlag
             if ("1".equals(interfaceName.getResourceType())) {
-                interfaceName.setBusinessFlag(isMatched);
+                int count = allInterfaceNameMapper.countNetChild(interfaceName);
+                boolean hasSub = false;
+                if(count > 0){
+                    hasSub = true;
+                }
+                interfaceName.setBusinessFlag(isMatched && hasSub);
             }
         }
 
@@ -133,12 +138,13 @@ public class AllInterfaceNameServiceImpl implements IAllInterfaceNameService
             }
 
             List<RmNetworkInterfaceRemote> interfaceRemoteList = netWorkListR.getData();
-            return interfaceRemoteList.stream()
+            boolean isBusiness =  interfaceRemoteList.stream()
                     .filter(info -> "1".equals(info.getBindIp()) || "3".equals(info.getBindIp()))
                     .anyMatch(internet ->
                             interfaceName.getServerIp() != null && internet.getMacAddress() != null &&
                                     interfaceName.getServerIp().equalsIgnoreCase(internet.getMacAddress())
                     );
+            return isBusiness;
 
         } else if ("2".equals(resourceType)) {
             // 交换机类型匹配逻辑

tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java

@@ -532,7 +532,6 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
         }
         if(memUtilList != null && !memUtilList.isEmpty()){
             registration.setMemUtil(memUtilList.get(0).getMemUtil());
-            registration.setMemTotalSize(memUtilList.get(0).getMemTotalSize());
         }
         if(rmResourceRegistration != null){
             registration.setMaxAgentVersion(rmResourceRegistration.getMaxAgentVersion());

tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml

@@ -313,4 +313,9 @@
             WHERE id = #{item.id}
         </foreach>
     </update>
+
+    <select id="countNetChild" parameterType="AllInterfaceName" resultType="java.lang.Integer">
+        select count(1) from rm_network_interface_child
+        where client_id = #{clientId} and parent_interface = SUBSTRING_INDEX(#{interfaceName}, '(', 1)
+    </select>
 </mapper>

tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml

@@ -314,17 +314,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND d.create_time = latest.latest_time
     </select>
     <select id="getMemUtil" resultType="RmResourceRegistration">
-        select
+        SELECT
         d.client_id as clientId,
-        max(CASE WHEN d.collect_type = 'memorySizeTotalCollect' THEN floor(d.collect_value/(1024 * 1024)) END) as memTotalSize,
-        max(CASE WHEN d.collect_type = 'memoryUtilizationCollect' THEN ROUND(d.collect_value, 1) END) as memUtil
+        ROUND(d.collect_value, 1) as memUtil
         FROM initial_system_other_collect_data d
         INNER JOIN (
         SELECT
         client_id,
         MAX(create_time) as max_time
         FROM initial_system_other_collect_data
-        WHERE (collect_type='memoryUtilizationCollect' or collect_type='memorySizeTotalCollect')
+        WHERE collect_type='memoryUtilizationCollect'
         AND client_id in
         <foreach collection="clientIdsStr.split(',')" item="clientId" open="(" separator="," close=")">
             #{clientId}
@@ -332,7 +331,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY client_id
         ) latest ON d.client_id = latest.client_id
         AND d.create_time = latest.max_time
-        AND (d.collect_type='memoryUtilizationCollect' or d.collect_type='memorySizeTotalCollect')
+        AND d.collect_type='memoryUtilizationCollect'
     </select>
     <update id="removeAlarmFlag" parameterType="RmResourceRegistration">
         update rm_resource_registration set del_alarm_time = now()