From 5c3b6df5917b97919ad432b5dc615386b655d0be Mon Sep 17 00:00:00 2001
From: gaoyutao <duguprogromer@163.com>
Date: Tue, 11 Nov 2025 10:55:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E6=97=B695=E5=80=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=B5=81=E9=87=8F=E7=A7=91=E5=AD=A6=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E6=B3=95=E3=80=81=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=BA=95?=
 =?UTF-8?q?=E5=B1=82=E6=B5=81=E9=87=8F=E6=89=80=E6=9C=89=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=BD=91=E5=8D=A1=E6=B5=81=E9=87=8F=E6=B1=82=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EpsTaskStatisticsServiceImpl.java    | 14 ++--
 .../system/EpsInitialTrafficDataMapper.xml    | 73 ++++++++++---------
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTaskStatisticsServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTaskStatisticsServiceImpl.java
index f51e0d3..7579800 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTaskStatisticsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsTaskStatisticsServiceImpl.java
@@ -87,12 +87,14 @@ public class EpsTaskStatisticsServiceImpl implements IEpsTaskStatisticsService
             taskStatistics.setTimeRange(timeRange);
             // 处理包含资源
             String resources = taskStatistics.getIncludedResources();
-            String result = Arrays.stream(resources.split(","))
-                    .map(msg -> msg.split(";"))
-                    .filter(resource -> resource.length >= 4)
-                    .map(resource -> "[" + resource[3] + "].[" + resource[2] + "]")
-                    .collect(Collectors.joining("\n"));
-            taskStatistics.setIncludedResources(result);
+            if("2".equals(taskStatistics.getResourceType())){
+                String result = Arrays.stream(resources.split(","))
+                        .map(msg -> msg.split(";"))
+                        .filter(resource -> resource.length >= 4)
+                        .map(resource -> "[" + resource[3] + "].[" + resource[2] + "]")
+                        .collect(Collectors.joining("\n"));
+                taskStatistics.setIncludedResources(result);
+            }
         }
         return epsTaskStatisticsList;
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
index bde2401..4622bb1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
@@ -181,54 +181,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 条件查询 -->
     <select id="selectByCondition" resultType="EpsInitialTrafficData">
         SELECT
-        id,
-        `name` AS name,
-        `mac` AS mac,
-        `status` AS status,
-        `type` AS type,
-        `ipV4` AS ipV4,
-        `in_dropped` AS inDropped,
-        `out_dropped` AS outDropped,
-        CAST(sum(ifnull(`in_speed`,0)) AS DECIMAL(20,0)) AS inSpeed,
-        CAST(sum(ifnull(`out_speed`,0)) AS DECIMAL(20,0)) AS outSpeed,
-        CAST(sum(ifnull(`total_in_speed`,0)) AS DECIMAL(20,0)) AS totalInSpeed,
-        CAST(sum(ifnull(`total_out_speed`,0)) AS DECIMAL(20,0)) AS totalOutSpeed,
-        `machine_flow` AS machineFlow,
-        `speed` AS speed,
-        `duplex` AS duplex,
-        business_id AS businessId,
-        business_name AS businessName,
-        service_sn AS serviceSn,
-        node_name AS nodeName,
-        revenue_method AS revenueMethod,
-        package_bandwidth AS packageBandwidth,
-        create_time AS createTime,
-        update_time AS updateTime,
-        create_by AS createBy,
-        update_by AS updateBy,
-        client_id AS clientId
-        FROM ${tableName}
+        a.id,
+        a.`name` AS name,
+        a.`mac` AS mac,
+        a.`status` AS status,
+        a.`type` AS type,
+        a.`ipV4` AS ipV4,
+        a.`in_dropped` AS inDropped,
+        a.`out_dropped` AS outDropped,
+        CAST(sum(ifnull(a.`in_speed`,0)) AS DECIMAL(20,0)) AS inSpeed,
+        CAST(sum(ifnull(a.`out_speed`,0)) AS DECIMAL(20,0)) AS outSpeed,
+        CAST(sum(ifnull(a.`total_in_speed`,0)) AS DECIMAL(20,0)) AS totalInSpeed,
+        CAST(sum(ifnull(a.`total_out_speed`,0)) AS DECIMAL(20,0)) AS totalOutSpeed,
+        a.`machine_flow` AS machineFlow,
+        a.`speed` AS speed,
+        a.`duplex` AS duplex,
+        a.business_id AS businessId,
+        a.business_name AS businessName,
+        a.service_sn AS serviceSn,
+        a.node_name AS nodeName,
+        a.revenue_method AS revenueMethod,
+        a.package_bandwidth AS packageBandwidth,
+        a.create_time AS createTime,
+        a.update_time AS updateTime,
+        a.create_by AS createBy,
+        a.update_by AS updateBy,
+        a.client_id AS clientId
+        FROM ${tableName} a
+        INNER JOIN rm_network_interface b ON a.client_id = b.client_id and and a.mac=b.mac_address
+        AND (b.bind_ip = 1 OR b.bind_ip = 3)
+        AND b.new_flag = 1
         <where>
             <if test="serviceSn != '' and serviceSn != null">
-                and service_sn = #{serviceSn}
+                and a.service_sn = #{serviceSn}
             </if>
             <if test="businessId != '' and businessId != null">
-                and business_id = #{businessId}
+                and a.business_id = #{businessId}
             </if>
             <if test="clientId != '' and clientId != null">
-                and client_id = #{clientId}
+                and a.client_id = #{clientId}
             </if>
             <if test="startTime != null">
-                and create_time &gt;= #{startTime}
+                and a.create_time &gt;= #{startTime}
             </if>
             <if test="endTime != null">
-                and create_time &lt;= #{endTime}
+                and a.create_time &lt;= #{endTime}
             </if>
             <if test="revenueMethod != null">
-                and revenue_method = #{revenueMethod}
+                and a.revenue_method = #{revenueMethod}
             </if>
         </where>
-        group BY create_time desc
+        GROUP BY a.create_time DESC
     </select>
 
     <!-- 条件查询 -->
@@ -270,7 +273,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getTrafficListByClientIds" resultType="EpsInitialTrafficData">
         SELECT
-        sum(ifnull(out_speed,0)) AS outSpeed,
+        CAST(sum(ifnull(out_speed,0)) AS DECIMAL(20,0)) AS outSpeed,
         create_time AS createTime
         FROM ${tableName}
         <where>