Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

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
+               }
             }
          }
       }

api/app/lib/controllers/project/bind.js

@@ -15,31 +15,59 @@ async function bindAnxin2pep (ctx) {
 
       let bindId_ = bindId
       const now = moment()
-      const existRes = await models.ProjectCorrelation.findOne({
+      // 仅限已有 pepProjectId 的项目
-         where: {
+      const existRes = pepProjectId ? await models.ProjectCorrelation.findOne({
+         where: Object.assign(
+            {},
+            pepProjectId ? {
                pepProjectId: pepProjectId
-         },
+            } : {
-         include: {
+               name,
-            model: models.ProjectApp
+            }
+         ),
+      }) : null
+
+      if (name) {
+         const pepRepeatNameCount = await clickHouse.projectManage.query(`SELECT COUNT(*) AS count FROM t_pim_project WHERE project_name='${name}'`).toPromise()
+         if (pepRepeatNameCount[0].count) {
+            throw `已有相同名称【${name}】的项企项目`
+         }
+         const pomsRepeatNameRes = await models.ProjectCorrelation.findAll({
+            where: {
+               name
             }
          })
+         if (pomsRepeatNameRes.some((pr) => {
+            return (
+               (
+                  // 有修改id但是不等于当前修改id的
+                  bindId && pr.id != bindId && !pr.del
+               ) || (
+                  !bindId && (
+                     (
+                        existRes && pr.id != existRes.id && !pr.del
+                     ) || (
+                        !existRes && !pr.del
+                     )
+                  )
+               )
+            )
+         })) {
+            throw `已有相同名称【${name}】的自定义项目`
+         }
+      }
 
       let storageData = {
          name, pepProjectId, anxinProjectId,
+         updateTime: now,
          del: false,
       }
 
       if (bindId) {
          // 修改
-         if (!existRes) {
-            throw '尚无已绑定的项企项目'
-         }
-         if (name) {
-
-         }
          await models.ProjectCorrelation.update(storageData, {
             where: {
-               pepProjectId: pepProjectId
+               id: bindId
             },
             transaction
          })
@@ -102,7 +130,7 @@ async function bindAnxin2pep (ctx) {
 async function del (ctx) {
    try {
       const models = ctx.fs.dc.models;
-      const { bindId } = ctx.query
+      const { bindId } = ctx.params
 
       await models.ProjectCorrelation.update({
          del: true
@@ -112,7 +140,7 @@ async function del (ctx) {
          }
       })
 
-      ctx.status = 20;
+      ctx.status = 204;
    } catch (error) {
       ctx.fs.logger.error(`path: ${ctx.path}, error: error`);
       ctx.status = 400;

api/app/lib/controllers/project/index.js

@@ -29,6 +29,7 @@ async function pomsProject (ctx) {
          where: {
             del: false
          },
+         order: [['updateTime', 'desc']],
          distinct: true,
          include: {
             model: models.App,
@@ -47,11 +48,15 @@ async function pomsProject (ctx) {
       let pepProjectIds = new Set()
       let anxinProjectIds = new Set()
       for (let p of proRes.rows) {
+         if (p.pepProjectId) {
             pepProjectIds.add(p.pepProjectId)
+         }
          for (let ap of p.anxinProjectId) {
+            if (ap) {
                anxinProjectIds.add(ap)
             }
          }
+      }
       const pepProjectRes = pepProjectIds.size ?
          await clickHouse.projectManage.query(
             `

api/app/lib/models/project_correlation.js

@@ -68,7 +68,16 @@ module.exports = dc => {
       primaryKey: false,
       field: "del",
       autoIncrement: false
-    }
+    },
+    updateTime: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "update_time",
+      autoIncrement: false
+    },
   }, {
     tableName: "project_correlation",
     comment: "",

script/0.0.3/2.alter_table_project_correlation.sql

@@ -7,3 +7,6 @@ alter table project_correlation
 	add del bool default false;
 
 alter table project_correlation alter column pep_project_id drop not null;
+
+alter table project_correlation
+	add update_time timestamp with time zone;