修复网卡信息有变动saas平台未及时更新、脚本策略下发未返回结果bug。

优化mtr探测策略

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tongran.rocketmq.mapper.RmAlarmLogMapper">
-    
+
     <resultMap type="RmAlarmLog" id="RmAlarmLogResult">
         <result property="id"    column="id"    />
         <result property="clientId"    column="client_id"    />
@@ -11,6 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mgmPublicIp"    column="mgm_public_ip"    />
         <result property="alarmType"    column="alarm_type"    />
         <result property="alarmContent"    column="alarm_content"    />
+        <result property="businessName"    column="business_name"    />
+        <result property="pushFlag"    column="push_flag"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createBy"    column="create_by"    />
@@ -18,17 +20,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRmAlarmLogVo">
-        select id, client_id, alarm_time, mgm_public_ip, alarm_type, alarm_content, create_time, update_time, create_by, update_by from rm_alarm_log
+        select id, client_id, alarm_time, mgm_public_ip, alarm_type, alarm_content, business_name, push_flag, create_time, update_time, create_by, update_by from rm_alarm_log
     </sql>
 
     <select id="selectRmAlarmLogList" parameterType="RmAlarmLog" resultMap="RmAlarmLogResult">
         <include refid="selectRmAlarmLogVo"/>
-        <where>  
+        <where>
             <if test="clientId != null  and clientId != ''"> and client_id = #{clientId}</if>
             <if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>
             <if test="mgmPublicIp != null  and mgmPublicIp != ''"> and mgm_public_ip = #{mgmPublicIp}</if>
             <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>
             <if test="alarmContent != null  and alarmContent != ''"> and alarm_content = #{alarmContent}</if>
+            <if test="businessName != null  and businessName != ''"> and business_name like concat('%', #{businessName}, '%')</if>
+            <if test="pushFlag != null "> and push_flag = #{pushFlag}</if>
         </where>
         order by alarm_time desc
     </select>
@@ -46,47 +50,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mgmPublicIp != null">mgm_public_ip,</if>
             <if test="alarmType != null">alarm_type,</if>
             <if test="alarmContent != null">alarm_content,</if>
+            <if test="businessName != null">business_name,</if>
+            <if test="pushFlag != null">push_flag,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="clientId != null and clientId != ''">#{clientId},</if>
             <if test="alarmTime != null">#{alarmTime},</if>
             <if test="mgmPublicIp != null">#{mgmPublicIp},</if>
             <if test="alarmType != null">#{alarmType},</if>
             <if test="alarmContent != null">#{alarmContent},</if>
+            <if test="businessName != null">#{businessName},</if>
+            <if test="pushFlag != null">#{pushFlag},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateRmAlarmLog" parameterType="RmAlarmLog">
         update rm_alarm_log
         <trim prefix="SET" suffixOverrides=",">
+            <if test="clientId != null and clientId != ''">client_id = #{clientId},</if>
+            <if test="alarmTime != null">alarm_time = #{alarmTime},</if>
             <if test="mgmPublicIp != null">mgm_public_ip = #{mgmPublicIp},</if>
+            <if test="alarmType != null">alarm_type = #{alarmType},</if>
             <if test="alarmContent != null">alarm_content = #{alarmContent},</if>
+            <if test="businessName != null">business_name = #{businessName},</if>
+            <if test="pushFlag != null">push_flag = #{pushFlag},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
         </trim>
-        <where>
-            <choose>
-                <when test="id != null">
-                    and id = #[id]
-                </when>
-                <when test="clientId != null and alarmType != null">
-                    and client_id = #{clientId} and alarm_type = #{alarmType}
-                </when>
-                <otherwise>
-                    and 1=0
-                </otherwise>
-            </choose>
-        </where>
+        where id = #{id}
     </update>
 
     <delete id="deleteRmAlarmLogById" parameterType="Long">

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

@@ -150,6 +150,6 @@
             <if test="bindIp != null">bind_ip = #{bindIp},</if>
             <if test="newFlag != null">new_flag = #{newFlag},</if>
         </trim>
-        where mac_address = #{macAddress} and clientId = #{clientId}
+        where mac_address = #{macAddress} and client_id = #{clientId}
     </update>
 </mapper>