feat:fix bugs

api/app/lib/controllers/analysis/network.js

@@ -1,8 +1,296 @@
 'use strict';
 const moment = require('moment')
 
+async function getMaintenceRecordRank(ctx) {
+   const sequelize = ctx.fs.dc.orm
+   const Sequelize = ctx.fs.dc.ORM;
+   const { clickHouse } = ctx.app.fs
+   const models = ctx.fs.dc.models
+   const { startTime, endTime } = ctx.query
 
-async function getOrganizationsStruc (ctx) {
+   console.log(startTime, endTime, ctx.query, '1212312')
+   try {
+      const res = await sequelize.query(`
+      SELECT emrp.project_id,count(1)
+FROM equipment_maintenance_record 
+    RIGHT JOIN equipment_maintenance_record_project emrp
+        on equipment_maintenance_record.id = emrp.equipment_maintenance_record_id
+        where report_time BETWEEN :startTime AND :endTime
+GROUP BY emrp.project_id
+      `
+         , {
+            replacements: {
+               startTime: moment(startTime).format('YYYY-MM-DD HH:mm:ss'),
+               endTime: moment(endTime).format('YYYY-MM-DD HH:mm:ss ')
+            }
+            //, type: sequelize.QueryTypes.SELECT
+         }
+      )
+      //查询equipment_maintenance_record返回的结果[{project_id: 22, count: 1}]
+      let projectList = []
+      //存project的id
+      let projectIdList = []
+      // console.log('resssss', res)
+      if (res.length > 0) {
+         res[0].forEach((item) => {
+            projectList.push({ project_id: item.project_id, count: Number(item.count) })
+            projectIdList.push(item.project_id)
+         })
+      }
+      const projectNameList = await models.ProjectCorrelation.findAll({
+         attributes:
+            ['id', 'name'],
+         where: {
+            id: { $in: projectIdList },
+            name: {
+               [Sequelize.Op.not]: null//有name的结果
+            }
+            // del: false
+         }
+      }) || []
+      //在ProjectCorrelation中查不到名字，去clickHouse中去查
+      const projectNameList1 = await models.ProjectCorrelation.findAll({
+         attributes:
+            ['id', 'name', 'pepProjectId'],
+         where: {
+            id: { $in: projectIdList },
+            name: {
+               [Sequelize.Op.eq]: null//无name的结果
+            }
+            // del: false
+         }
+      })
+      //存放需要去查询clickHouse的id
+      let idList = new Set()
+      if (projectNameList1.length) {
+         projectNameList1.forEach((item) => {
+            idList.add(item.pepProjectId)
+         })
+      }
+      //pepProject名称
+      const projectManageName = idList.size ? await clickHouse.projectManage.query(`
+         SELECT id,project_name  FROM t_pim_project
+           WHERE id IN (${[...idList].join(',')}, -1)
+      `).toPromise() : []
+      // if (projectList.length) {
+      //    projectList.forEach((item) => {
+      //       projectManageName
+      //    })
+      // }
+      //存的是{id,projectName}
+      let project = []
+      if (projectNameList1.length && projectManageName.length) {
+         projectManageName.forEach((item) => {
+            const pepObj = projectNameList1.find((item1) => { return item1.pepProjectId === item.id })
+            project.push({ id: pepObj.id, projectName: item.project_name })
+         })
+      }
+      const resAll = project.concat(projectNameList)
+      let mergedArray = []
+      if (resAll.length && projectList) {
+         mergedArray = projectList.map(obj1 => {
+            const matchingObj = resAll.find(obj2 => obj2.id === obj1.project_id);
+            return { id: obj1.project_id, pepProjectId: matchingObj.id, projectName: matchingObj.projectName || matchingObj.dataValues.name, count: obj1.count };
+         });
+      }
+      // console.log('ididididid', resAll)
+      // console.log('ididididid', project)
+      // console.log('ididididid', projectManageName)
+      // console.log('ididididid', projectNameList)
+      // console.log('ididididid', projectList)
+
+      ctx.status = 200
+      ctx.body = mergedArray
+   } catch (error) {
+      ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+      ctx.status = 400;
+      ctx.body = {
+         message: '查询维修记录排名失败'
+      }
+   }
+}
+
+
+async function getMaintenceTotal(ctx) {
+   const sequelize = ctx.fs.dc.orm
+   const Sequelize = ctx.fs.dc.ORM;
+   const { clickHouse } = ctx.app.fs
+   const models = ctx.fs.dc.models
+   const { startTime, endTime } = ctx.query
+   try {
+      //所有维修记录
+      const res = await sequelize.query(`
+      SELECT emrp.project_id,
+      count(case when record.status in ('维修中','待维修','维修完成') then record.id end)  incomplete,
+      count(case when record.status in ('维修完成') then record.id end) completed
+ FROM equipment_maintenance_record  record
+     RIGHT JOIN equipment_maintenance_record_project emrp
+         on record.id = emrp.equipment_maintenance_record_id
+         where report_time BETWEEN :startTime AND :endTime
+ GROUP BY emrp.project_id
+         `
+         , {
+            replacements: {
+               startTime: moment(startTime).format('YYYY-MM-DD HH:mm:ss '),
+               endTime: moment(endTime).format('YYYY-MM-DD HH:mm:ss ')
+            }
+            //, type: sequelize.QueryTypes.SELECT
+         }
+      )
+      //查询equipment_maintenance_record返回的结果[{project_id: 22,status:'' count: 1}]
+      let projectList = []
+      //存project的id
+      let projectIdList = new Set()
+      // console.log('resssss', res)
+      if (res.length > 0) {
+         res[0].forEach((item) => {
+            projectList.push({ project_id: item.project_id, 'incomplete': Number(item.incomplete), completed: Number(item.completed) })
+            projectIdList.add(item.project_id)
+         })
+      }
+      // const result = projectList.reduce((acc, curr) => {
+      //    if (curr.status === '待维修' || curr.status === '维修中') {
+      //       const existingItem = acc.find(item => item.project_id === curr.project_id && item.status === '异常数');
+      //       if (existingItem) {
+      //          existingItem.count += curr.count;
+      //       } else {
+      //          acc.push({ project_id: curr.project_id, status: '异常数', count: curr.count });
+      //       }
+      //    } else if (curr.status === '维修完成') {
+      //       const existingItem = acc.find(item => item.project_id === curr.project_id && item.status === '维修数');
+      //       if (existingItem) {
+      //          existingItem.count += curr.count;
+      //       } else {
+      //          acc.push({ project_id: curr.project_id, status: '维修数', count: curr.count });
+      //       }
+      //    }
+      //    return acc;
+      // }, [])
+      //console.log('resssssresult', result)
+      const projectNameList = await models.ProjectCorrelation.findAll({
+         attributes:
+            ['id', 'name'],
+         where: {
+            id: { $in: [...projectIdList] },
+            name: {
+               [Sequelize.Op.not]: null//有name的结果
+            }
+            // del: false
+         }
+      }) || []
+      //在ProjectCorrelation中查不到名字，去clickHouse中去查
+      const projectNameList1 = await models.ProjectCorrelation.findAll({
+         attributes:
+            ['id', 'name', 'pepProjectId'],
+         where: {
+            id: { $in: [...projectIdList] },
+            name: {
+               [Sequelize.Op.eq]: null//无name的结果
+            }
+            // del: false
+         }
+      })
+      //存放需要去查询clickHouse的id
+      let idList = new Set()
+      if (projectNameList1.length) {
+         projectNameList1.forEach((item) => {
+            idList.add(item.pepProjectId)
+         })
+      }
+      //pepProject名称
+      const projectManageName = idList.size ? await clickHouse.projectManage.query(`
+         SELECT id,project_name  FROM t_pim_project
+           WHERE id IN (${[...idList].join(',')}, -1)
+      `).toPromise() : []
+      let project = []
+      if (projectNameList1.length && projectManageName.length) {
+         projectManageName.forEach((item) => {
+            const pepObj = projectNameList1.find((item1) => { return item1.pepProjectId === item.id })
+            project.push({ id: pepObj.id, projectName: item.project_name })
+         })
+      }
+      //pg的数据和clcikHouse的数据（名字）合并
+      const resAll = project.concat(projectNameList)
+      let mergedArray = []
+      if (resAll.length && projectList) {
+         mergedArray = projectList.map(obj1 => {
+            const matchingObj = resAll.find(obj2 => obj2.id === obj1.project_id)
+            return {
+               id: obj1.project_id, incomplete: obj1.incomplete, completed: obj1.completed, pepProjectId: matchingObj.id,
+               projectName: matchingObj.projectName || matchingObj.dataValues.name
+            }
+         });
+      }
+
+      // console.log('ididididid', resAll)
+      // console.log('ididididid', project)
+      // console.log('ididididid', projectManageName)
+      // console.log('ididididid', projectNameList)
+      // console.log('ididididid', projectList)
+      ctx.status = 200
+      ctx.body = mergedArray
+   } catch (error) {
+      ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+      ctx.status = 400;
+      ctx.body = {
+         message: '查询维修记录统计失败'
+      }
+   }
+
+
+}
+async function getEquipmentCategory(ctx) {
+   const { startTime, endTime } = ctx.query
+   const Sequelize = ctx.fs.dc.ORM
+   const models = ctx.fs.dc.models
+   try {
+      const res = await models.EquipmentMaintenanceRecord.findAll({
+         attributes: [
+            'equipment_category',
+            [Sequelize.fn('COUNT', Sequelize.col('equipment_category')), 'count']
+         ],
+         where: { reportTime: { $between: [moment(startTime).format('YYYY-MM-DD HH:mm:ss '), moment(endTime).format('YYYY-MM-DD HH:mm:ss ')] } },
+         group: ['equipment_category']
+      })
+      ctx.status = 200
+      ctx.body = res
+
+   } catch (error) {
+      ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+      ctx.status = 400;
+      ctx.body = {
+         message: '查询设备类型失败'
+      }
+   }
+}
+
+
+async function getStatus(ctx) {
+   const { startTime, endTime } = ctx.query
+   const Sequelize = ctx.fs.dc.ORM
+   const models = ctx.fs.dc.models
+   try {
+      const res = await models.EquipmentMaintenanceRecord.findAll({
+         attributes: [
+            'status',
+            [Sequelize.fn('COUNT', Sequelize.col('status')), 'count']
+         ],
+         where: { reportTime: { $between: [moment(startTime).format('YYYY-MM-DD HH:mm:ss '), moment(endTime).format('YYYY-MM-DD HH:mm:ss ')] } },
+         group: ['status']
+      })
+      ctx.status = 200
+      ctx.body = res
+
+   } catch (error) {
+      ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+      ctx.status = 400;
+      ctx.body = {
+         message: '查询设备类型失败'
+      }
+   }
+}
+
+async function getOrganizationsStruc(ctx) {
    try {
       const { utils: { anxinStrucIdRange } } = ctx.app.fs
       const { pepProjectId } = ctx.params
@@ -59,8 +347,115 @@ async function getThingsDeploy (ctx) {
 }
 
 
+async function findDeviceLastData(ctx, deviceIds) {
+   let rslt = [];
+   const clientRaws = ctx.app.fs.esclient[RAW_DATA];
+   const clientVbraws = ctx.app.fs.esclient[VBRAW_DATA];
+   if (deviceIds) {
+       for (let id of deviceIds) {
+           let params = {
+               index: clientRaws.config.index,
+               type: clientRaws.config.type,
+               body: {
+                   query: {
+                       constant_score: {
+                           filter: {
+                               bool: {
+                                   must: [
+                                       { term: { "iota_device": id } },
+                                       { range: { "collect_time": { lte: moment().toISOString() } } }
+                                   ]
+                               }
+                           }
+                       }
+                   },
+                   sort: [
+                       {
+                           "collect_time": {
+                               order: "desc"
+                           }
+                       }
+                   ],
+                   size: 1
+               }
+           };
+           let res = await clientRaws.search(params);
+           if (res.hits.hits.length == 0) {
+               params.index = clientVbraws.config.index;
+               params.type = clientVbraws.config.type;
+               res = await clientVbraws.search(params);
+           }
+
+           let data = res.hits.hits.map(h => {
+               let source = h._source;
+               let data_ = source.data;
+               if (params.index == clientVbraws.config.index) {
+                   let tempData = { "最大幅值": '_' };
+                   if (data_.raw && data_.raw.length) {
+                       let maxAmplitude = data_.raw[0];
+                       for (let v of data_.raw) {
+                           if (maxAmplitude < v) {
+                               maxAmplitude = v;
+                           }
+                       }
+                       tempData['最大幅值'] = maxAmplitude + '（gal）';
+                   }
+                   data_ = tempData;
+               }
+               return {
+                   collectTime: source.collect_time,
+                   iotaDevice: source.iota_device,
+                   iotaDeviceName: source.iota_device_name,
+                   data: data_
+               }
+           });
+           rslt.push({
+               sensorId: id,
+               data: data
+           });
+       }
+   }
+   return rslt;
+}
+async function getDeviceLists(ctx) {
+   try {
+      const sensorIds = ctx.request.body.sensorIds;
+      let rslt = await findDeviceLastData(ctx, sensorIds);
+      ctx.status = 200;
+      ctx.body = rslt;
+  } catch (error) {
+      ctx.status = 400;
+      ctx.body = {
+          "name": "FindError",
+          "message": "原始数据查询失败"
+      }
+  }
+
+}
+
+//    try {
+//       const { clickHouse } = ctx.app.fs
+//       const { thingIds } = ctx.params
+//       // const res = thingIds ? await clickHouse.iot.query(
+//       //    `SELECT distinct dv.name,dv.thingId,dv.id,dv.deviceMetaId,re.properties 
+//       //    FROM iota.Device dv
+//       //    LEFT JOIN iota.FilteredResource re
+//       //    ON dv.deviceMetaId=re.key
+//       //    WHERE thing_id in (${thingIds})`).toPromise() : []
+
+
+//    } catch {
+//       ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
+//       ctx.status = 400;
+//       ctx.body = {
+//          message: '查询设备列表失败'
+//       }
+//    }
+
+
 
 module.exports = {
    getOrganizationsStruc,
    getThingsDeploy,
+   getDeviceLists
 }

api/app/lib/routes/analysis/network.js

@@ -9,6 +9,8 @@ module.exports = function (app, router, opts) {
    router.get('/things/:thingId/deploy', network.getThingsDeploy)
 
    
+   app.fs.api.logAttr['POST/sensors/last/data'] = { content: '原始数据查询失败', visible: true };
+   router.post('/sensors/last/data', network.getDeviceLists)
 
    // app.fs.api.logAttr['GET/systemAvailability'] = { content: '获取系统可用性', visible: true };
    // router.get('/systemAvailability', operationData.getSystemAvailability)

web/client/src/sections/install/containers/system.jsx

@@ -196,7 +196,7 @@ const Example = (props) => {
                                  // )
                                     row.anxinProject.length >= 2 ? (
                                     <Tooltip content={item.name}>
-                                       <div style={{ width: item.name.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}>
+                                       <div  style={{ width: item.name.length > 4 ? '70px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: index > 2 ? 'none' : '', color: item.projectState == -1 ? '#F93920' : '' }}>
                                           {item.name}
                                        </div>
                                     </Tooltip>):(

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

@@ -313,7 +313,7 @@ const Bigscreen = (props) => {
                               },
                               tooltip: {
                                  trigger: 'axis',
-                                 position: 'inside',
+                                 confine:true,//固定在图表中
                                  formatter: function (params) {
                                     // 自定义提示框内容
                                     // console.log(params);