设计消息推送数据表、开发消息推送相关逻辑方法。

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml

@@ -182,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByCondition" resultType="EpsInitialTrafficData">
         SELECT
         a.id,
-        a.`name` AS name,
+        GROUP_CONCAT(DISTINCT a.`name` SEPARATOR ',') AS name,
         a.`mac` AS mac,
         a.`status` AS status,
         a.`type` AS type,
@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        INNER JOIN rm_network_interface b ON a.client_id = b.client_id and a.mac=b.mac_address
         AND (b.bind_ip = 1 OR b.bind_ip = 3)
         AND b.new_flag = 1
         <where>