优化执行结果根据失败关键字筛选

优化告警日志
监控看板概览功能

ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmDeploymentPolicyMapper.xml

@@ -24,6 +24,7 @@
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="deployDevice"    column="deploy_device"    />
+        <result property="scriptId"    column="script_id"    />
         <result property="scriptName"    column="script_name"    />
         <result property="scriptPath"    column="script_path"    />
         <result property="defaultParams"    column="default_params"    />
@@ -31,7 +32,7 @@
     </resultMap>
 
     <sql id="selectRmDeploymentPolicyVo">
-        select id, policy_name, description, resource_group_id, included_devices_id, source_file_path_type, source_file_path, target_directory, command_content, execution_method, scheduled_time, policy_status, deploy_time, script_type, create_time, update_time, create_by, update_by, deploy_device, script_name, script_path, default_params, task_name from rm_deployment_policy
+        select id, policy_name, description, resource_group_id, included_devices_id, source_file_path_type, source_file_path, target_directory, command_content, execution_method, scheduled_time, policy_status, deploy_time, script_type, create_time, update_time, create_by, update_by, deploy_device, script_id, script_name, script_path, default_params, task_name from rm_deployment_policy
     </sql>
 
     <select id="selectRmDeploymentPolicyList" parameterType="RmDeploymentPolicy" resultMap="RmDeploymentPolicyResult">
@@ -51,6 +52,7 @@
             <if test="deployTime != null "> and deploy_time = #{deployTime}</if>
             <if test="scriptType != null  and scriptType != ''"> and script_type = #{scriptType}</if>
             <if test="deployDevice != null  and deployDevice != ''"> and deploy_device = #{deployDevice}</if>
+            <if test="scriptId != null "> and script_id = #{scriptId}</if>
             <if test="scriptName != null  and scriptName != ''"> and script_name like concat('%', #{scriptName}, '%')</if>
             <if test="scriptPath != null  and scriptPath != ''"> and script_path = #{scriptPath}</if>
             <if test="defaultParams != null  and defaultParams != ''"> and default_params = #{defaultParams}</if>
@@ -85,6 +87,7 @@
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="deployDevice != null">deploy_device,</if>
+            <if test="scriptId != null">script_id,</if>
             <if test="scriptName != null">script_name,</if>
             <if test="scriptPath != null">script_path,</if>
             <if test="defaultParams != null">default_params,</if>
@@ -109,6 +112,7 @@
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="deployDevice != null">#{deployDevice},</if>
+            <if test="scriptId != null">#{scriptId},</if>
             <if test="scriptName != null">#{scriptName},</if>
             <if test="scriptPath != null">#{scriptPath},</if>
             <if test="defaultParams != null">#{defaultParams},</if>
@@ -137,6 +141,7 @@
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="deployDevice != null">deploy_device = #{deployDevice},</if>
+            <if test="scriptId != null">script_id = #{scriptId},</if>
             <if test="scriptName != null">script_name = #{scriptName},</if>
             <if test="scriptPath != null">script_path = #{scriptPath},</if>
             <if test="defaultParams != null">default_params = #{defaultParams},</if>

ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmResourceRemoteMapper.xml

@@ -44,7 +44,14 @@
             <if test="resultFlag != null "> and result_flag = #{resultFlag}</if>
             <if test="scriptId != null "> and script_id = #{scriptId}</if>
         </where>
-        order by result_flag asc,create_time desc
+        <choose>
+            <when test="clientId != null and clientId != ''">
+                order by create_time desc
+            </when>
+            <otherwise>
+                order by result_flag asc,create_time desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectRmResourceRemoteById" parameterType="Long" resultMap="RmResourceRemoteResult">