修复个别机器出省流量统计失败问题。

增加日95利用率排序

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

@@ -287,6 +287,7 @@ public class MessageHandler {
                 // 查询子网卡
                 RmNetworkInterfaceChild childQuery = new RmNetworkInterfaceChild();
                 childQuery.setClientId(message.getClientId());
+                childQuery.setIpv4Flag(true);
                 List<RmNetworkInterfaceChild> existingChildren = rmNetworkInterfaceChildService.selectRmNetworkInterfaceChildList(childQuery);
                 if(existingChildren != null && !existingChildren.isEmpty()){
                     RmNetworkInterfaceChild networkInfoChild = existingChildren.get(0);
@@ -349,7 +350,7 @@ public class MessageHandler {
                             String stdLocalIsp = localIsp != null ? localIsp.replace("中国", "") : "";
                             String stdOperator = operator.replace("中国", "");
                             // 省不一样或者省一样但运营商不一样
-                            if (!localProvince.equals(province) || !stdLocalIsp.equals(stdOperator)) {
+                            if (!province.equals(localProvince) || !stdLocalIsp.equals(stdOperator)) {
                                 String key = province + operator; // 根据图片格式，省份和运营商之间没有空格
                                 double currentCount = v4StatMap.getOrDefault(key, 0.0);
                                 v4StatMap.put(key, currentCount + tcpdumpVo.getCount());
@@ -392,7 +393,7 @@ public class MessageHandler {
                             String stdLocalIsp = localIsp != null ? localIsp.replace("中国", "") : "";
                             String stdOperator = operator.replace("中国", "");
                             // 省不一样或者省一样但运营商不一样
-                            if (!localProvince.equals(province) || !stdLocalIsp.equals(stdOperator)) {
+                            if (!province.equals(localProvince) || !stdLocalIsp.equals(stdOperator)) {
                                 String key = province + operator; // 根据图片格式，省份和运营商之间没有空格
                                 double currentCount = v6StatMap.getOrDefault(key, 0.0);
                                 v6StatMap.put(key, currentCount + tcpdumpVo.getCount());

tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialMemoryDetailsInfoMapper.xml

@@ -52,6 +52,7 @@
             <if test="partNumber != null  and partNumber != ''"> and part_number = #{partNumber}</if>
             <!-- 新增health_status查询条件 -->
             <if test="healthStatus != null  and healthStatus != ''"> and health_status = #{healthStatus}</if>
+            and `name` not like "%not%"
         </where>
     </select>