Explorar o código

【集团报警条件管理】修改报警类型后,页面该条报警类型不更新

xujiaheng %!s(int64=3) %!d(string=hai) anos
pai
achega
08ffa3994b

+ 4 - 0
src/main/java/com/persagy/apm/alarmservice/group/alarmrule/model/dto/UpdateGroupAlarmRuleDTO.java

@@ -27,6 +27,10 @@ public class UpdateGroupAlarmRuleDTO {
     @NotNull(message = "报警类型编码不能为空") // todo 更新校验规则
     private String alarmItemCode;
 
+    @ApiModelProperty(value = "报警类型名称", required = true)
+    @NotNull(message = "报警类型名称不能为空") // todo 更新校验规则
+    private String alarmItemName;
+
     @ApiModelProperty(value = "报警规则", required = true)
     @NotNull(message = "报警规则不能为空") // todo 更新校验规则
     private UpdateAlarmConditionDTO alarmCondition;

+ 0 - 6
src/main/resources/mapper/ProjectAlarmRuleMapper.xml

@@ -39,9 +39,6 @@
         <if test="alarmItemCode != null and alarmItemCode != ''">
             and a.alarm_item_code = #{alarmItemCode}
         </if>
-        <if test="equipName != null and equipName != ''">
-            and b.obj_name like '%${equipName}%'
-        </if>
     </select>
     <select id="queryList" resultMap="ProjectAlarmRuleMap">
         select a.id,
@@ -63,9 +60,6 @@
         <if test="alarmItemCode != null and alarmItemCode != ''">
             and a.alarm_item_code = #{alarmItemCode}
         </if>
-        <if test="equipName != null and equipName != ''">
-            and b.obj_name like '%${equipName}%'
-        </if>
         order by a.creation_time
         limit #{startIndex},#{size}
     </select>