项目集类型

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

@@ -158,12 +158,31 @@ async function groupStatistic (ctx) {
 
       // 获取所有的 安心云项目id
       let anxinProjectIds = new Set()
+      let pepmProjectIds = new Set()
       for (let project of groupProjectRes) {
          for (let projectId of project.anxinProjectId) {
             anxinProjectIds.add(projectId)
          }
+         if (project.pepProjectId) {
+            pepmProjectIds.add(project.pepProjectId)
+         }
       }
       let anxinProjectIdArr = Array.from(anxinProjectIds)
+      let pepmProjectIdArr = Array.from(pepmProjectIds)
+
+      // 查询pepm项目的客户等级
+      let pepmCustomerLevelRes = pepmProjectIdArr.length ? await clickHouse.projectManage.query(
+         `
+            SELECT DISTINCT t_rpm_customer_level.id AS id, t_rpm_customer_level.name AS name FROM t_pim_project
+               RIGHT JOIN t_rpm_customer
+                  ON t_rpm_customer.id = t_pim_project.related_customers_id
+               RIGHT JOIN t_rpm_customer_level
+                  ON t_rpm_customer_level.id = t_rpm_customer.level
+               WHERE t_pim_project.id IN (${pepmProjectIdArr.join(',')},-1)
+         `
+      ).toPromise() : []
+
+      pepmCustomerLevelRes.sort((a, b) => a.id - b.id)
 
       // 统计安心云项目下的结构物 
       const strucRes = anxinProjectIdArr.length ? await clickHouse.anxinyun.query(
@@ -260,6 +279,7 @@ async function groupStatistic (ctx) {
             todayAlarms,
             maxOffLineTime,
             anxinProjectCount,
+            level: pepmCustomerLevelRes.length ? pepmCustomerLevelRes[0] : null
          })
       }
 

api/app/lib/schedule/alarms_push.js

@@ -1191,7 +1191,7 @@ module.exports = function (app, opts) {
                                  alarms.AlarmCode AS AlarmCode,
                                  alarms.SourceTypeId AS SourceTypeId,
                                  alarms.StructureId AS StructureId,
-                                 alarms.subStations AS subStations,
+                                 alarms.subStations AS subStations
                               FROM 
                                  alarms
                               WHERE 

web/client/src/sections/projectGroup/containers/statistic.jsx

@@ -64,7 +64,9 @@ const Statistic = (props) => {
          title: '项目集类型',
          dataIndex: "name",
          key: 'name',
-         render: (_, row) => '--'
+         render: (_, row) => {
+            return row?.level ? row?.level?.name + ' 级' : '--'
+         }
       }, {
          title: '项目个数',
          dataIndex: "pomsProjectIds",