心跳监测内容修改，ip对应数据改为clientId对应硬件SN，监控模板，策略bug修改

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

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertAllInterfaceName" parameterType="AllInterfaceName" useGeneratedKeys="true" keyProperty="id">
-        insert into all_interface_name
+        insert IGNORE into all_interface_name
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="clientId != null and clientId != ''">client_id,</if>
             <if test="interfaceName != null and interfaceName != ''">interface_name,</if>
@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 批量插入接口名称 -->
     <insert id="batchInsert" parameterType="java.util.List">
-        INSERT INTO all_interface_name
+        INSERT IGNORE INTO all_interface_name
         (
         interface_name,
         client_id,

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

@@ -148,6 +148,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and rrr.ip_address = #{ipAddress}
         </where>
     </select>
+
+    <select id="getNodeMsgBySn" parameterType="String" resultType="java.util.Map">
+        SELECT
+        rrr.hardware_sn AS hardwareSn,
+        rrr.resource_name AS resourceName,
+        esrc.revenue_method AS revenueMethod,
+        esrc.business_code AS businessCode,
+        esrc.business_name AS businessName,
+        esrc.package_bandwidth AS packageBandwidth
+        FROM
+        rm_resource_registration rrr
+        LEFT JOIN
+        eps_server_revenue_config esrc
+        ON
+        rrr.hardware_sn = esrc.hardware_sn
+        <where>
+            and rrr.registration_status = '1'
+            and rrr.hardware_sn = #{hardwareSn}
+        </where>
+    </select>
+
     <select id="countBySn" parameterType="String">
         <include refid="selectEpsServerRevenueConfigVo"/>
         where hardware_sn = #{hardwareSn}

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

@@ -248,7 +248,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateStatusByResource" parameterType="RmResourceRegistration">
         update rm_resource_registration
         <trim prefix="SET" suffixOverrides=",">
-            <if test="hardwareSn != null">hardware_sn = #{hardwareSn},</if>
             <if test="resourceType != null">resource_type = #{resourceType},</if>
             <if test="resourceName != null">resource_name = #{resourceName},</if>
             <if test="ipAddress != null">ip_address = #{ipAddress},</if>
@@ -280,7 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterId != null">updater_id = #{updaterId},</if>
             <if test="updaterName != null">updater_name = #{updaterName},</if>
         </trim>
-        where ip_address = #{ipAddress}
+        where hardware_sn = #{hardwareSn}
     </update>
     <select id="getRegistrationByIds" parameterType="String" resultMap="RmResourceRegistrationResult">
         <include refid="selectRmResourceRegistrationVo"/>