修改获取监控列表接口

src/main/java/cn/qg/holmes/controller/monitor/MonitorTaskController.java

@@ -43,7 +43,7 @@ public class MonitorTaskController {
      * @param pageSize 每页多少个
      * @param businessLine 业务线
      * @param serviceName 服务名
-     * @param owner 负责人
+     * @param taskName 监控名称
      * @return
      */
     @GetMapping("/list")
@@ -51,7 +51,7 @@ public class MonitorTaskController {
                                          @RequestParam(defaultValue = "10") Integer pageSize,
                                          @RequestParam String businessLine,
                                          @RequestParam String serviceName,
-                                         @RequestParam String owner) {
+                                         @RequestParam String taskName) {
         QueryWrapper<MonitorTask> queryWrapper = new QueryWrapper<>();
         if (!StringUtils.isEmpty(businessLine)) {
             queryWrapper.eq("business_line", businessLine);
@@ -59,14 +59,18 @@ public class MonitorTaskController {
         if (!StringUtils.isEmpty(serviceName)) {
             queryWrapper.eq("service_name", serviceName);
         }
-        if (!StringUtils.isEmpty(owner)) {
-            queryWrapper.eq("owner", owner);
+        if (!StringUtils.isEmpty(taskName)) {
+            queryWrapper.eq("task_name", taskName);
         }
         queryWrapper.orderByDesc("id");
         IPage<MonitorTask> pageParam = new Page<>(pageNum, pageSize);
         IPage<MonitorTask> monitorTaskIPage = monitorTaskService.page(pageParam, queryWrapper);
+        List<MonitorTask> monitorTaskList = monitorTaskIPage.getRecords();
+        for (MonitorTask monitorTask: monitorTaskList) {
+            monitorTask.setDsName(monitorDataSourceService.getById(monitorTask.getDsId()).getName());
+        }
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("list", monitorTaskIPage.getRecords());
+        resultMap.put("list", monitorTaskList);
         resultMap.put("total", monitorTaskIPage.getTotal());
         return JsonResult.buildSuccessResult(resultMap);
     }

src/main/java/cn/qg/holmes/entity/monitor/MonitorTask.java

@@ -92,4 +92,7 @@ public class MonitorTask {
     @TableField(value = "`update_time`")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+    @TableField(exist = false)
+    private String dsName;
 }