Browse Source

修改字段

xujiaheng 3 years ago
parent
commit
7fd686fe59

+ 12 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/controller/ProjectAlarmRuleObjRelController.java

@@ -1,5 +1,6 @@
 package com.persagy.apm.alarmservice.project.alarmruleobjrel.controller;
 
+import com.persagy.apm.alarmservice.project.alarmcondition.service.IAlarmConditionService;
 import com.persagy.apm.alarmservice.project.alarmruleobjrel.service.IProjectAlarmRuleObjRelService;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,8 @@ import java.util.List;
 public class ProjectAlarmRuleObjRelController {
     @Autowired
     private IProjectAlarmRuleObjRelService projectAlarmRuleObjRelService;
+    @Autowired
+    private IAlarmConditionService alarmConditionService;
 
 	@ApiOperation(value = "创建项目报警规则与监测对象的关联")
     @ApiIgnore
@@ -112,5 +115,14 @@ public class ProjectAlarmRuleObjRelController {
         List<ProjectAlarmRuleObjRelListItemVO> resultList = ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(projectAlarmRuleObjRelList);
         return ResultHelper.multi(resultList);
     }
+
+//    @ApiOperation(value = "项目报警规则与监测对象的关联列表")
+//    @PostMapping("/queryRuleObjRel")
+//    public CommonResult<PageList<ProjectAlarmRuleObjRelListItemVO>> queryRuleObjRel(
+//            @Valid @RequestBody QueryRuleObjRelDTO queryRuleObjRelDTO) {
+//        alarmConditionService.queryRuleObjRel(queryRuleObjRelDTO);
+//        List<ProjectAlarmRuleObjRelListItemVO> resultList = ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(projectAlarmRuleObjRelList);
+//        return ResultHelper.multi(resultList);
+//    }
 }
 

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

@@ -0,0 +1,23 @@
+package com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author lixing
+ * @version V1.0 2021-09-08 22:46:37
+ */
+@Data
+@ApiModel(value = "查询项目报警规则与监测对象的关联入参")
+public class QueryRuleObjRelDTO {
+    @ApiModelProperty(value = "分组id", required = true)
+    @NotNull(message = "分组id不能为空") // todo 更新校验规则
+    private String groupId;
+
+    @ApiModelProperty(value = "报警类型编码", required = true)
+    @NotNull(message = "报警类型编码不能为空") // todo 更新校验规则
+    private String alarmItemCode;
+}

File diff suppressed because it is too large
+ 1 - 1
src/main/resources/db/init/table.sql


+ 4 - 4
src/main/resources/mapper/ProjectAlarmRuleMapper.xml

@@ -13,8 +13,8 @@
         <result column="modifier" property="modifier"/>
         <result column="modified_time" property="modifiedTime"/>
         <collection property="relListItemList" ofType="com.persagy.apm.alarmservice.project.alarmruleobjrel.model.vo.ProjectAlarmRuleObjRelVO">
-            <result column="equip_id" property="equipId"/>
-            <result column="equip_name" property="equipName"/>
+            <result column="obj_id" property="equipId"/>
+            <result column="obj_name" property="equipName"/>
             <result column="open" property="open"/>
         </collection>
     </resultMap>
@@ -40,8 +40,8 @@
                a.creation_time,
                a.modified_time,
                a.modifier,
-               b.equip_id,
-               b.equip_name,
+               b.obj_id,
+               b.obj_name,
                b.open
         from project_alarm_rule a
                  left join project_alarm_rule_obj_rel b on a.id = b.project_alarm_rule_id