xujiaheng hace 3 años
padre
commit
8682531a6f

+ 1 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/dao/ProjectAlarmRuleObjRelMapper.java

@@ -16,5 +16,5 @@ import java.util.List;
 @Mapper
 public interface ProjectAlarmRuleObjRelMapper extends BaseMapper<ProjectAlarmRuleObjRel>{
 
-    void updateStatus(@Param("shieldManageDTOList") List<ShieldManageDTO> shieldManageDTOList);
+    void updateStatus(@Param("shieldManageDTOList") List<ShieldManageDTO> shieldManageDTOList, @Param("projectAlarmRuleId") String projectAlarmRuleId, @Param("projectId") String projectId);
 }

+ 1 - 7
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/model/dto/ShieldManageDTO.java

@@ -13,10 +13,6 @@ import javax.validation.constraints.NotNull;
 @Data
 @ApiModel(value = "创建项目报警规则与监测对象的关联入参")
 public class ShieldManageDTO {
-    @ApiModelProperty(value = "项目报警规则id", required = true)
-    @NotNull(message = "项目报警规则id不能为空") // todo 更新校验规则
-    private String projectAlarmRuleId;
-    
     @ApiModelProperty(value = "设备ID", required = true)
     @NotNull(message = "设备ID不能为空") // todo 更新校验规则
     private String objId;
@@ -25,9 +21,7 @@ public class ShieldManageDTO {
     @NotNull(message = "屏蔽状态 1-open、0- 屏蔽不能为空") // todo 更新校验规则
     private Integer open;
     
-    @ApiModelProperty(value = "项目id", required = true)
-    @NotNull(message = "项目id不能为空") // todo 更新校验规则
-    private String projectId;
+
 
     public static String PROP_PROJECT_ALARM_RULE_ID = "project_alarm_rule_id";
     public static String PROP_PROJECT_ID = "project_id";

+ 9 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/model/dto/ShieldManageListDTO.java

@@ -14,6 +14,15 @@ import java.util.List;
 @Data
 @ApiModel(value = "创建项目报警规则与监测对象的关联入参")
 public class ShieldManageListDTO {
+
+    @ApiModelProperty(value = "项目id", required = true)
+    @NotNull(message = "项目id不能为空") // todo 更新校验规则
+    private String projectId;
+
+    @ApiModelProperty(value = "项目报警规则id", required = true)
+    @NotNull(message = "项目报警规则id不能为空") // todo 更新校验规则
+    private String projectAlarmRuleId;
+
     List<ShieldManageDTO> shieldManageDTOList;
     
 }

+ 3 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/service/impl/ProjectAlarmRuleObjRelServiceImpl.java

@@ -266,7 +266,9 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
     @Override
     public void updateBatch(ShieldManageListDTO shieldManageListDTO) {
         List<ShieldManageDTO> shieldManageDTOList = shieldManageListDTO.getShieldManageDTOList();
-        projectAlarmRuleObjRelMapper.updateStatus(shieldManageDTOList);
+        String projectAlarmRuleId = shieldManageListDTO.getProjectAlarmRuleId();
+        String projectId = shieldManageListDTO.getProjectId();
+        projectAlarmRuleObjRelMapper.updateStatus(shieldManageDTOList,projectAlarmRuleId,projectId);
     }
 
     @Override

+ 3 - 3
src/main/resources/mapper/ProjectAlarmRuleObjRelMapper.xml

@@ -16,14 +16,14 @@
         <result column="valid" property="valid"/>
     </resultMap>
     <update id="updateStatus">
-        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+        <foreach collection="shieldManageDTOList" item="item" index="index" open="" close="" separator=";">
             update project_alarm_rule_obj_rel
             <set>
                 open=#{item.open}
             </set>
             <where>
-                project_alarm_rule_id =#{item.projectAlarmRuleId}
-                and project_id = #{item.projectId}
+                project_alarm_rule_id =#{projectAlarmRuleId}
+                and project_id = #{projectId}
                 and obj_id = #{item.objId}
             </where>
         </foreach>