应用告警查询接口

api/app/lib/controllers/alarm/app.js

@@ -198,7 +198,7 @@ async function apiErrorList (ctx) {
             $or: []
          },
          include: [{
-            model: models.ProjectApp,
+            model: models.App,
             where: {
 
             },
@@ -225,10 +225,10 @@ async function apiErrorList (ctx) {
          if (projectRes.length) {
             findOption.where.$or.push(
                {
-                  '$projectApp.projectCorrelation.pep_project_id$': {
+                  '$app->projectCorrelations.pep_project_id$': {
                      $in: projectRes.map(p => p.id)
                   },
-                  '$projectApp.name$': { $like: `%${keyword}%` }
+                  '$app.name$': { $like: `%${keyword}%` }
                }
             )
          }
@@ -276,8 +276,10 @@ async function apiErrorList (ctx) {
          // 没有关键字筛选 查询关联的项目信息
          let pepProjectIds = new Set()
          for (let lr of listRes.rows) {
-            if (lr.projectApp && lr.projectApp.projectCorrelation) {
+            if (lr.app && lr.app.projectCorrelations) {
-               pepProjectIds.add(lr.projectApp.projectCorrelation.pepProjectId)
+               for (let p of lr.app.projectCorrelations) {
+                  pepProjectIds.add(p.pepProjectId)
+               }
             }
          }
          if (pepProjectIds.size) {
@@ -289,10 +291,12 @@ async function apiErrorList (ctx) {
       }
 
       for (let lr of listRes.rows) {
-         if (lr.projectApp && lr.projectApp.projectCorrelation) {
+         if (lr.app && lr.app.projectCorrelations) {
-            let corPepProject = projectRes.find(p => p.id == lr.projectApp.projectCorrelation.pepProjectId)
+            for (let p of lr.app.projectCorrelations) {
+               let corPepProject = projectRes.find(pr => pr.id == p.pepProjectId)
                if (corPepProject) {
-               lr.projectApp.projectCorrelation.dataValues.pepProject = corPepProject
+                  p.dataValues.pepProject = corPepProject
+               }
             }
          }
       }