Compare commits
17 Commits
tang
...
dev/binary_data
| Author | SHA1 | Date | |
|---|---|---|---|
| f7f270a18a | |||
| 917380a961 | |||
| 7d2e8009b6 | |||
| c277d7c94c | |||
| d93633704e | |||
| 87bcb29242 | |||
| 442eb1eed5 | |||
| 0a0608aa09 | |||
| 423a56466a | |||
| eb79905024 | |||
| 853cf888de | |||
| 3ee4d5a118 | |||
| 37e13ca93f | |||
| 59ebcb946e | |||
| 4a6587530c | |||
| c264157a15 | |||
| be1500bbbc |
@@ -1,6 +1,7 @@
|
||||
import RecordingDataMeta from '../../models/file/recording_data_meta'
|
||||
import childProcess from 'child_process'
|
||||
import path from 'path'
|
||||
import { createReadStream } from 'fs'
|
||||
|
||||
const recordingDataMeta = new RecordingDataMeta()
|
||||
|
||||
@@ -55,3 +56,13 @@ export const spikeDetect = async (ctx, next) => {
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getCSV = async (ctx, next) => {
|
||||
const name = ctx.query.name
|
||||
ctx.type = 'stream'
|
||||
// ctx.attachment = name + '.csv'
|
||||
ctx.set('Content-disposition', `attachment; filename=${name}.csv`)
|
||||
ctx.body = createReadStream(path.resolve(__dirname, '../../../../data-analysis/csv_file', 'output.csv'))
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
import ConfigurationModal from '../../models/configuration/configuration'
|
||||
|
||||
const configuration = new ConfigurationModal()
|
||||
|
||||
export const create = async (ctx, next) => {
|
||||
const data = ctx.request.body
|
||||
const result = await configuration.create(data)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const update = async (ctx, next) => {
|
||||
const data = ctx.request.body
|
||||
const id = ctx.params.id
|
||||
const result = await configuration.update(data, id)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const get = async (ctx, next) => {
|
||||
const configurationType = ctx.query.type
|
||||
const id = ctx.query.id
|
||||
const library = ctx.query.library
|
||||
const query = { id: id, library: library }
|
||||
const result = await configuration.get(configurationType, query)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const clearDeleted = async (ctx, next) => {
|
||||
const controllerID = ctx.params.controller_id
|
||||
const result = await configuration.clearDeleted(controllerID)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
@@ -19,6 +19,33 @@ export const update = async (ctx, next) => {
|
||||
next()
|
||||
}
|
||||
|
||||
export const get = async (ctx, next) => {
|
||||
const id = ctx.query.id
|
||||
const name = ctx.query.name
|
||||
const type = ctx.query.type
|
||||
const controllerId = ctx.query.controllerId
|
||||
|
||||
// folder
|
||||
const parent = ctx.query.parent
|
||||
const limit = ctx.query.limit
|
||||
const offset = ctx.query.offset
|
||||
const order = ctx.query.order
|
||||
const attrs = ctx.query.attrs
|
||||
|
||||
const query = {}
|
||||
let result = ''
|
||||
if (id) query.id = id
|
||||
if (name) query.name = name
|
||||
if (type) query.type = type
|
||||
if (controllerId) query.controllerId = controllerId
|
||||
if (id || name) result = await collection.getByQueryWithAttrs(query, attrs)
|
||||
if (type === 'folder') result = await collection.getByParentWithOffsetLimitOrder(type, parent, limit, offset, order)
|
||||
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const clearDeleted = async (ctx, next) => {
|
||||
const controllerID = ctx.params.controller_id
|
||||
const result = await collection.clearDeleted(controllerID)
|
||||
|
||||
@@ -31,6 +31,49 @@ export const clearDeleted = async (ctx, next) => {
|
||||
next()
|
||||
}
|
||||
|
||||
export const findWithIdRange = async (ctx, next) => {
|
||||
const id = JSON.parse(ctx.query.id)
|
||||
const range = JSON.parse(ctx.query.range)
|
||||
|
||||
const result = await recordingDataMeta.findWithIdRange1(id, range)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const get = async (ctx, next) => {
|
||||
const id = ctx.query.id
|
||||
const name = ctx.query.name
|
||||
const uuid = ctx.query.uuid
|
||||
const type = ctx.query.type
|
||||
const time = ctx.query.time
|
||||
// folder
|
||||
const parent = ctx.query.parent
|
||||
const limit = ctx.query.limit
|
||||
const offset = ctx.query.offset
|
||||
const order = ctx.query.order
|
||||
const attrs = ctx.query.attrs
|
||||
const group = ctx.query.group
|
||||
|
||||
// project
|
||||
const project = ctx.query.project
|
||||
|
||||
const query = {}
|
||||
let result = ''
|
||||
if (id) query.id = id
|
||||
if (name) query.name = name
|
||||
if (uuid) query.uuid = uuid
|
||||
if (time) query.time = time
|
||||
if ((id || name || uuid || time) || type === undefined) result = await recordingDataMeta.getByQueryWithAttrs(query, limit, offset, order, attrs, group)
|
||||
|
||||
if (type === 'folder' && parent) result = await recordingDataMeta.getByFolderWithParentLimitOffsetOrderAttrs(type, parent, limit, offset, order, attrs)
|
||||
if (type === 'project' && project) result = await recordingDataMeta.getByProject(project)
|
||||
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getByID = async (ctx, next) => {
|
||||
const id = ctx.params.id
|
||||
const result = await recordingDataMeta.getByID(id)
|
||||
|
||||
@@ -10,6 +10,9 @@ import * as recordingDataRaw from './file/recording_data_raw'
|
||||
import * as recordingDataMini from './file/recording_data_mini'
|
||||
import * as analysis from './analysis'
|
||||
import * as project from './project/project'
|
||||
import * as projectReport from './project/project_report'
|
||||
import * as projectMeta from './project/project_meta'
|
||||
import * as chart from './configuration/chart'
|
||||
|
||||
export default {
|
||||
upload,
|
||||
@@ -23,5 +26,8 @@ export default {
|
||||
recordingDataRaw,
|
||||
recordingDataMini,
|
||||
analysis,
|
||||
project
|
||||
project,
|
||||
projectReport,
|
||||
projectMeta,
|
||||
chart
|
||||
}
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
import ProjectMeta from '../../models/project/project_meta'
|
||||
|
||||
const projectMeta = new ProjectMeta()
|
||||
|
||||
export const create = async (ctx, next) => {
|
||||
const data = ctx.request.body
|
||||
console.log('create', data)
|
||||
const result = await projectMeta.create(data)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const update = async (ctx, next) => {
|
||||
const data = ctx.request.body
|
||||
const id = ctx.params.id
|
||||
const result = await projectMeta.update(data, id)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const updateByAttr = async (ctx, next) => {
|
||||
const attr = ctx.params.attr
|
||||
const value = ctx.params.value
|
||||
const result = await projectMeta.updateByAttr(attr, value)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const get = async (ctx, next) => {
|
||||
const id = ctx.query.id
|
||||
const name = ctx.query.name
|
||||
const uuid = ctx.query.uuid
|
||||
|
||||
const attrs = ctx.query.attrs
|
||||
const order = ctx.query.order
|
||||
|
||||
const query = {}
|
||||
let result = ''
|
||||
if (id) query.id = id
|
||||
if (name) query.name = name
|
||||
if (uuid) query.uuid = uuid
|
||||
result = await projectMeta.getByQueryWithAttrs(query, attrs, order)
|
||||
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const clearDeleted = async (ctx, next) => {
|
||||
const result = await projectMeta.clearDeleted()
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getByID = async (ctx, next) => {
|
||||
const index = ctx.params.channel
|
||||
const id = ctx.params.id
|
||||
const result = await projectMeta.getByID(id, index)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getByAttr = async (ctx, next) => {
|
||||
const attr = ctx.params.attr
|
||||
const value = ctx.params.value
|
||||
const result = await projectMeta.getByAttr(attr, value)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getAll = async (ctx, next) => {
|
||||
const result = await projectMeta.getAll()
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
import ProjectReport from '../../models/project/project_report'
|
||||
|
||||
const projectReport = new ProjectReport()
|
||||
|
||||
export const create = async (ctx, next) => {
|
||||
const data = ctx.request.body
|
||||
console.log('create', data)
|
||||
const result = await projectReport.create(data)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const update = async (ctx, next) => {
|
||||
const data = ctx.request.body
|
||||
const id = ctx.params.id
|
||||
const result = await projectReport.update(data, id)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const updateByAttr = async (ctx, next) => {
|
||||
const attr = ctx.params.attr
|
||||
const value = ctx.params.value
|
||||
const result = await projectReport.updateByAttr(attr, value)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const get = async (ctx, next) => {
|
||||
const id = ctx.query.id
|
||||
const name = ctx.query.name
|
||||
const uuid = ctx.query.uuid
|
||||
|
||||
const attrs = ctx.query.attrs
|
||||
const order = ctx.query.order
|
||||
|
||||
const query = {}
|
||||
let result = ''
|
||||
if (id) query.id = id
|
||||
if (name) query.name = name
|
||||
if (uuid) query.uuid = uuid
|
||||
result = await projectReport.getByQueryWithAttrs(query, attrs, order)
|
||||
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const clearDeleted = async (ctx, next) => {
|
||||
const result = await projectReport.clearDeleted()
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getByID = async (ctx, next) => {
|
||||
const index = ctx.params.channel
|
||||
const id = ctx.params.id
|
||||
const result = await projectReport.getByID(id, index)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getByAttr = async (ctx, next) => {
|
||||
const attr = ctx.params.attr
|
||||
const value = ctx.params.value
|
||||
const result = await projectReport.getByAttr(attr, value)
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
export const getAll = async (ctx, next) => {
|
||||
const result = await projectReport.getAll()
|
||||
ctx.body = result
|
||||
|
||||
next()
|
||||
}
|
||||
@@ -28,7 +28,10 @@ db.tasks = require('./schema/task.model')(sequelize, Sequelize)
|
||||
db.devices = require('./schema/device.model')(sequelize, Sequelize)
|
||||
db.collections = require('./schema/collection.model')(sequelize, Sequelize)
|
||||
db.projects = require('./schema/project.model')(sequelize, Sequelize)
|
||||
db.project_reports = require('./schema/project_report.model')(sequelize, Sequelize)
|
||||
db.project_metas = require('./schema/project_meta.model')(sequelize, Sequelize)
|
||||
db.recording_data_metas = require('./schema/recording_data_meta.model')(sequelize, Sequelize)
|
||||
db.charts = require('./schema/configuration/chart.model')(sequelize, Sequelize)
|
||||
for (let i = 0; i < 32; i++) {
|
||||
db[i + '_recording_data_raws'] = require('./schema/recording_data_raw.model')(sequelize, Sequelize, i)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
module.exports = (sequelize, Sequelize) => {
|
||||
const Configuration = sequelize.define('configuration', {
|
||||
name: {
|
||||
type: Sequelize.STRING
|
||||
},
|
||||
library: {
|
||||
type: Sequelize.STRING
|
||||
},
|
||||
layout: {
|
||||
type: Sequelize.JSONB
|
||||
},
|
||||
chart: {
|
||||
type: Sequelize.JSONB
|
||||
},
|
||||
parameter: {
|
||||
type: Sequelize.JSONB
|
||||
},
|
||||
user_auth: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {
|
||||
owner: [],
|
||||
maintainer: [],
|
||||
guest: []
|
||||
}
|
||||
},
|
||||
locked: {
|
||||
type: Sequelize.BOOLEAN
|
||||
},
|
||||
deleted: {
|
||||
type: Sequelize.BOOLEAN,
|
||||
defaultValue: false
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
}
|
||||
},
|
||||
{
|
||||
timestamps: false
|
||||
})
|
||||
|
||||
return Configuration
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
module.exports = (sequelize, Sequelize) => {
|
||||
const Chart = sequelize.define('chart', {
|
||||
name: {
|
||||
type: Sequelize.STRING
|
||||
},
|
||||
description: {
|
||||
type: Sequelize.STRING
|
||||
},
|
||||
library: {
|
||||
type: Sequelize.STRING
|
||||
},
|
||||
num: {
|
||||
type: Sequelize.INTEGER
|
||||
},
|
||||
data: {
|
||||
type: Sequelize.JSONB
|
||||
},
|
||||
user_auth: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {
|
||||
owner: [],
|
||||
maintainer: [],
|
||||
guest: []
|
||||
}
|
||||
},
|
||||
locked: {
|
||||
type: Sequelize.BOOLEAN,
|
||||
defaultValue: false
|
||||
},
|
||||
deleted: {
|
||||
type: Sequelize.BOOLEAN,
|
||||
defaultValue: false
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
}
|
||||
},
|
||||
{
|
||||
timestamps: false
|
||||
})
|
||||
|
||||
return Chart
|
||||
}
|
||||
@@ -10,6 +10,10 @@ module.exports = (sequelize, Sequelize) => {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {}
|
||||
},
|
||||
cycle: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: []
|
||||
},
|
||||
device: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {}
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
module.exports = (sequelize, Sequelize) => {
|
||||
const ProjectMeta = sequelize.define('project_metas', {
|
||||
project: {
|
||||
type: Sequelize.STRING
|
||||
},
|
||||
cycle: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: []
|
||||
},
|
||||
task: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {}
|
||||
},
|
||||
serial_number: {
|
||||
type: Sequelize.INTEGER
|
||||
},
|
||||
deleted: {
|
||||
type: Sequelize.BOOLEAN,
|
||||
defaultValue: false
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
}
|
||||
},
|
||||
{
|
||||
timestamps: false
|
||||
})
|
||||
|
||||
return ProjectMeta
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
module.exports = (sequelize, Sequelize) => {
|
||||
const ProjectReport = sequelize.define('project_report', {
|
||||
name: {
|
||||
type: Sequelize.STRING,
|
||||
default: ''
|
||||
},
|
||||
desc: {
|
||||
type: Sequelize.STRING,
|
||||
default: ''
|
||||
},
|
||||
task: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {}
|
||||
},
|
||||
cycle: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: []
|
||||
},
|
||||
device: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {}
|
||||
},
|
||||
uuid: {
|
||||
type: Sequelize.STRING(36)
|
||||
},
|
||||
user_auth: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {
|
||||
owner: [],
|
||||
maintainer: [],
|
||||
guest: []
|
||||
}
|
||||
},
|
||||
deleted: {
|
||||
type: Sequelize.BOOLEAN,
|
||||
defaultValue: false
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
|
||||
}
|
||||
},
|
||||
{
|
||||
timestamps: false
|
||||
})
|
||||
|
||||
return ProjectReport
|
||||
}
|
||||
@@ -53,6 +53,9 @@ module.exports = (sequelize, Sequelize) => {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {}
|
||||
},
|
||||
project: {
|
||||
type: Sequelize.INTEGER
|
||||
},
|
||||
parameter_set: {
|
||||
type: Sequelize.JSONB,
|
||||
defaultValue: {}
|
||||
|
||||
@@ -43,6 +43,10 @@ module.exports = (sequelize, Sequelize, i) => {
|
||||
type: Sequelize.TEXT,
|
||||
defaultValue: ''
|
||||
},
|
||||
bytea_data: {
|
||||
type: Sequelize.BLOB,
|
||||
defaultValue: Buffer.alloc(0) // Empty Buffer
|
||||
},
|
||||
compressed: {
|
||||
type: Sequelize.BOOLEAN,
|
||||
defaultValue: false
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
const db = require('../../db/database')
|
||||
|
||||
const Op = db.Sequelize.Op
|
||||
|
||||
class ConfigurationModel {
|
||||
async create (req) {
|
||||
return db.charts.create(
|
||||
req
|
||||
)
|
||||
}
|
||||
|
||||
async update (req, id) {
|
||||
if (id != null) {
|
||||
const ret = await db.charts.update(
|
||||
req,
|
||||
{
|
||||
where: {
|
||||
id: id
|
||||
}
|
||||
}
|
||||
)
|
||||
return ret
|
||||
} else {
|
||||
const ret = await db.charts.update(
|
||||
req,
|
||||
{
|
||||
where: {}
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
}
|
||||
|
||||
async clearDeleted () {
|
||||
const ret = await db.charts.destroy(
|
||||
{
|
||||
where: {
|
||||
deleted: true
|
||||
}
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
|
||||
async get (type, query) {
|
||||
let where = {}
|
||||
if (type === 'chart') {
|
||||
where = {
|
||||
chart: {
|
||||
[Op.ne]: null
|
||||
}
|
||||
}
|
||||
}
|
||||
Object.assign(query, where)
|
||||
const ret = await db.charts.findAll(
|
||||
{
|
||||
where: where
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
|
||||
async getByQueryWithAttrs (query, limit, offset, order, attrs, group) {
|
||||
const attrList = attrs ? attrs.split('-') : undefined
|
||||
const ret = await db.charts.findAll(
|
||||
{
|
||||
// where: db.Sequelize.where(db.Sequelize.fn('DATE', db.Sequelize.col('created_at')), '2022-12-02'),
|
||||
where: query,
|
||||
attributes: attrList,
|
||||
order: order,
|
||||
limit: limit,
|
||||
offset: offset
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
}
|
||||
|
||||
export default ConfigurationModel
|
||||
@@ -19,6 +19,44 @@ class CollectionModel {
|
||||
return ret
|
||||
}
|
||||
|
||||
async getByQueryWithAttrs (query, attrs) {
|
||||
const attrList = attrs ? attrs.split('-') : undefined
|
||||
const ret = await db.collections.findAll(
|
||||
{
|
||||
where: query,
|
||||
attributes: attrList
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
|
||||
async getByParentWithOffsetLimitOrder (type, parent, limit, offset, order, attrs) {
|
||||
const attrList = attrs ? attrs.split('-') : undefined
|
||||
const orderList = order ? order.split('-') : ['id', 'desc']
|
||||
const collectionType = type + '::jsonb'
|
||||
const parentOp = {}
|
||||
|
||||
console.log('getByParentWithOffsetLimitOrder', type, parent, limit, offset, order, attrs)
|
||||
|
||||
parentOp[collectionType] = {
|
||||
[Op.contains]: '[' + parent + ']'
|
||||
}
|
||||
const ret = await db.collections.findAndCountAll(
|
||||
{
|
||||
where: {
|
||||
parent: parentOp
|
||||
},
|
||||
attributes: attrList,
|
||||
order: [
|
||||
orderList
|
||||
],
|
||||
limit: limit,
|
||||
offset: offset
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
|
||||
async clearDeleted (controllerID) {
|
||||
let ret
|
||||
if (controllerID == null) {
|
||||
|
||||
@@ -98,7 +98,7 @@ class RecordingDataMeta {
|
||||
return ret
|
||||
}
|
||||
|
||||
async getByAttrParent(type, parent, attr) {
|
||||
async getByAttrParent (type, parent, attr) {
|
||||
const attrList = attr.split('-')
|
||||
const collectionType = type + '::jsonb'
|
||||
const parentOp = {}
|
||||
@@ -113,13 +113,13 @@ class RecordingDataMeta {
|
||||
attributes: attrList,
|
||||
order: [
|
||||
['id', 'DESC']
|
||||
],
|
||||
]
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
|
||||
async getCountByParent(type, parent) {
|
||||
async getCountByParent (type, parent) {
|
||||
const collectionType = type + '::jsonb'
|
||||
const parentOp = {}
|
||||
parentOp[collectionType] = {
|
||||
@@ -246,6 +246,263 @@ class RecordingDataMeta {
|
||||
})
|
||||
return ret
|
||||
}
|
||||
|
||||
async getByQueryWithAttrs (query, limit, offset, order, attrs, group) {
|
||||
console.log('getByQueryWithAttrs', query, limit, offset, order, attrs, group)
|
||||
const result = {}
|
||||
let attrList = attrs ? attrs.split('-') : undefined
|
||||
// group by time
|
||||
if (group === 'time') {
|
||||
const timeGroupNum = await db.recording_data_metas.findAll(
|
||||
{
|
||||
attributes: [[db.Sequelize.fn('COUNT', db.Sequelize.fn('DISTINCT', db.Sequelize.fn('DATE', db.Sequelize.col('created_at')))), 'GroupCount']]
|
||||
}
|
||||
)
|
||||
result.counts = timeGroupNum
|
||||
|
||||
attrList = [[db.Sequelize.fn('DATE', db.Sequelize.col('created_at')), 'date'], [db.sequelize.fn('COUNT', 'date'), 'count']]
|
||||
group = [db.Sequelize.fn('DATE', db.Sequelize.col('created_at')), 'date']
|
||||
order = [[db.Sequelize.fn('DATE', db.Sequelize.col('created_at')), 'desc']]
|
||||
}
|
||||
// group by project
|
||||
if (group === 'project') {
|
||||
attrList = [['project', 'project']]
|
||||
group = ['project', 'project']
|
||||
order = [['project', 'desc']]
|
||||
}
|
||||
// query by time
|
||||
if (query.time) {
|
||||
const start = new Date(query.time)
|
||||
const end = new Date(query.time)
|
||||
end.setDate(end.getDate() + 1)
|
||||
delete query.time
|
||||
query.created_at = {
|
||||
[Op.gte]: start,
|
||||
[Op.lte]: end
|
||||
}
|
||||
}
|
||||
const ret = await db.recording_data_metas.findAll(
|
||||
{
|
||||
// where: db.Sequelize.where(db.Sequelize.fn('DATE', db.Sequelize.col('created_at')), '2022-12-02'),
|
||||
where: query,
|
||||
attributes: attrList,
|
||||
group: group,
|
||||
order: order,
|
||||
limit: limit,
|
||||
offset: offset
|
||||
}
|
||||
)
|
||||
result.rows = ret
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
async getByFolderWithParentLimitOffsetOrderAttrs (type, parent, limit, offset, order, attrs) {
|
||||
const attrList = attrs ? attrs.split('-') : undefined
|
||||
const orderList = order ? order.split('-') : ['id', 'desc']
|
||||
const collectionType = type + '::jsonb'
|
||||
const parentOp = {}
|
||||
|
||||
console.log('getByFolderWithParentLimitOffsetOrderAttr', type, parent, limit, offset, order, attrs)
|
||||
|
||||
parentOp[collectionType] = {
|
||||
[Op.contains]: '[' + parent + ']'
|
||||
}
|
||||
const ret = await db.recording_data_metas.findAndCountAll(
|
||||
{
|
||||
where: {
|
||||
parent: parentOp
|
||||
},
|
||||
attributes: attrList,
|
||||
order: [
|
||||
[orderList[0], orderList[1]]
|
||||
],
|
||||
limit: limit,
|
||||
offset: offset
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
|
||||
async getByProject (uuid) {
|
||||
const [results, _] = await db.sequelize.query(`
|
||||
WITH ProjectData AS (SELECT * FROM project_reports WHERE uuid='${uuid}')
|
||||
SELECT rdm.* FROM ProjectData pr
|
||||
LEFT JOIN project_metas pm ON pr.uuid = pm.project
|
||||
LEFT JOIN recording_data_metas rdm ON pm.id = rdm.project
|
||||
ORDER BY rdm.id desc
|
||||
`)
|
||||
return results
|
||||
}
|
||||
|
||||
async findWithIdRange1 (metaIdArray, range) {
|
||||
/* get x channel & range, y channel & range */
|
||||
const channelX = range[0][0]
|
||||
const rangeX = range[0].slice(1, 3).sort(function (a, b) {
|
||||
return a - b
|
||||
})
|
||||
const channelY = range[1][0]
|
||||
const rangeY = range[1].slice(1, 3).sort(function (a, b) {
|
||||
return a - b
|
||||
})
|
||||
// console.log(channelX, rangeX, channelY, rangeY)
|
||||
const pairID = []
|
||||
|
||||
/* loop with given idArray */
|
||||
for (const _id of metaIdArray) {
|
||||
const meta = await db.recording_data_metas.findOne({
|
||||
where: {
|
||||
id: _id
|
||||
},
|
||||
attributes: ['id', 'raw_data', 'name']
|
||||
})
|
||||
/* if channel has time */
|
||||
if (channelX === 'Time' || channelY === 'Time') {
|
||||
if (channelX === 'Time') {
|
||||
/* if x is time, then get the y channel data */
|
||||
for (const index in meta.raw_data[channelY]) {
|
||||
/* if meta id is paired already then break */
|
||||
if (pairID.findIndex((ele) => ele[0] === meta.id) !== -1) break
|
||||
const rawID = meta.raw_data[channelY][index]
|
||||
const rawData = await db[channelY + '_recording_data_raws'].findOne({
|
||||
where: {
|
||||
id: rawID
|
||||
}
|
||||
})
|
||||
/* get time & data */
|
||||
const data = rawData.data.replace(/"\*\*\*"/g, ' ').split(' ')
|
||||
const time = data.filter((ele, index) => index % 2 === 0)
|
||||
const value = data.filter((ele, index) => index % 2 === 1)
|
||||
/* check with value & time range */
|
||||
for (let index = 0; index < value.length; index++) {
|
||||
if (value[index] <= rangeY[1] && value[index] >= rangeY[0]) {
|
||||
if (time[index] <= rangeX[1] && time[index] >= rangeX[0]) {
|
||||
pairID.push([meta.id, meta.name])
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (channelY === 'Time') {
|
||||
for (const index in meta.raw_data[channelX]) {
|
||||
if (pairID.findIndex((ele) => ele[0] === meta.id) !== -1) break
|
||||
const rawID = meta.raw_data[channelX][index]
|
||||
const rawData = await db[channelX + '_recording_data_raws'].findOne({
|
||||
where: {
|
||||
id: rawID
|
||||
}
|
||||
})
|
||||
/* get time & data */
|
||||
const data = rawData.data.replace(/"\*\*\*"/g, ' ').split(' ')
|
||||
const time = data.filter((ele, index) => index % 2 === 0)
|
||||
const value = data.filter((ele, index) => index % 2 === 1)
|
||||
/* check with value & time range */
|
||||
for (let index = 0; index < value.length; index++) {
|
||||
if (value[index] <= rangeX[1] && value[index] >= rangeX[0]) {
|
||||
if (time[index] <= rangeY[1] && time[index] >= rangeY[0]) {
|
||||
pairID.push([meta.id, meta.name])
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* when two channels are not time */
|
||||
/* loop with raw data id */
|
||||
for (const index in meta.raw_data[channelX]) {
|
||||
/* if meta id is paired already then break */
|
||||
if (pairID.findIndex((ele) => ele[0] === meta.id) !== -1) break
|
||||
/* get X channel data */
|
||||
const rawIDX = meta.raw_data[channelX][index]
|
||||
const rawDataX = await db[channelX + '_recording_data_raws'].findOne({
|
||||
where: {
|
||||
id: rawIDX
|
||||
}
|
||||
})
|
||||
const valueX = rawDataX.data.replace(/"\*\*\*"/g, ' ').split(' ').filter((ele, index) => index % 2 === 1)
|
||||
/* get Y channel data */
|
||||
const rawIDY = meta.raw_data[channelY][index]
|
||||
const rawDataY = await db[channelY + '_recording_data_raws'].findOne({
|
||||
where: {
|
||||
id: rawIDY
|
||||
}
|
||||
})
|
||||
const valueY = rawDataY.data.replace(/"\*\*\*"/g, ' ').split(' ').filter((ele, index) => index % 2 === 1)
|
||||
/* if x value in range then check y value in range */
|
||||
for (let index = 0; index < valueX.length; index++) {
|
||||
if (valueX[index] <= rangeX[1] && valueX[index] >= rangeX[0]) {
|
||||
if (valueY[index] <= rangeY[1] && valueY[index] >= rangeY[0]) {
|
||||
pairID.push([meta.id, meta.name])
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log('pair', pairID)
|
||||
}
|
||||
return pairID
|
||||
}
|
||||
|
||||
// async findWithIdRange (id, range) {
|
||||
// const channel = String(range[0][0])
|
||||
// const dataRange = range[0].slice(1, 3)
|
||||
// const matchFile = []
|
||||
|
||||
// for (const _id of id) {
|
||||
// console.log('id', _id)
|
||||
// const meta = await db.recording_data_metas.findOne({
|
||||
// where: {
|
||||
// id: _id
|
||||
// },
|
||||
// attributes: ['id', 'raw_data', 'name']
|
||||
// })
|
||||
// if (await matchRange(channel, meta.raw_data[channel], dataRange) === true) {
|
||||
// matchFile.push(meta.id)
|
||||
// }
|
||||
// }
|
||||
|
||||
// console.log('matchFile', matchFile)
|
||||
// const channel1 = range[1][0]
|
||||
// const range1 = range[1].slice(1, 3)
|
||||
// const doubleMatchFile = []
|
||||
|
||||
// for (const _id of matchFile) {
|
||||
// const meta = await db.recording_data_metas.findOne({
|
||||
// where: {
|
||||
// id: _id
|
||||
// },
|
||||
// attributes: ['id', 'raw_data', 'name']
|
||||
// })
|
||||
// console.log('meta', meta.id)
|
||||
// if (await matchRange(channel1, meta.raw_data[channel1], range1) === true) {
|
||||
// doubleMatchFile.push([meta.id, meta.name])
|
||||
// }
|
||||
// }
|
||||
// console.log('doubleMatchFile', doubleMatchFile)
|
||||
// return doubleMatchFile
|
||||
// }
|
||||
// }
|
||||
|
||||
// async function matchRange (channel, rawIdList, range) {
|
||||
// console.log('matchRange', channel, rawIdList, range)
|
||||
// for (const rawId of rawIdList) {
|
||||
// const raw = await db[channel + '_recording_data_raws'].findOne({
|
||||
// where: {
|
||||
// id: rawId
|
||||
// }
|
||||
// })
|
||||
// const value = raw.data.split('"***"')[0].split(' ').filter((ele, index) => index % 2 === 1)
|
||||
// for (const val of value) {
|
||||
// console.log('val', val)
|
||||
// if (val < range[1] && val > range[0]) {
|
||||
// return true
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return false
|
||||
}
|
||||
|
||||
export default RecordingDataMeta
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
const db = require('../../db/database')
|
||||
|
||||
class ProjectMeta {
|
||||
async create (req) {
|
||||
return db.project_metas.create(req)
|
||||
}
|
||||
|
||||
async update (req, id) {
|
||||
if (id != null) {
|
||||
const ret = await db.project_metas.update(
|
||||
req,
|
||||
{
|
||||
where: {
|
||||
id: id
|
||||
}
|
||||
}
|
||||
)
|
||||
return ret
|
||||
} else {
|
||||
const ret = await db.project_metas.update(
|
||||
req,
|
||||
{
|
||||
where: {}
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
}
|
||||
|
||||
async getByQueryWithAttrs (query, attrs, order) {
|
||||
const attrList = attrs ? attrs.split('-') : undefined
|
||||
const orderList = order ? order.split('-') : ['id', 'desc']
|
||||
console.log('getByQueryWithAttrs', query, attrs, order)
|
||||
const ret = await db.project_metas.findAndCountAll(
|
||||
{
|
||||
where: query,
|
||||
attributes: attrList,
|
||||
// group: group,
|
||||
order: [orderList]
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
}
|
||||
|
||||
export default ProjectMeta
|
||||
@@ -0,0 +1,46 @@
|
||||
const db = require('../../db/database')
|
||||
|
||||
class ProjectReport {
|
||||
async create (req) {
|
||||
return db.project_reports.create(req)
|
||||
}
|
||||
|
||||
async update (req, id) {
|
||||
if (id != null) {
|
||||
const ret = await db.project_reports.update(
|
||||
req,
|
||||
{
|
||||
where: {
|
||||
id: id
|
||||
}
|
||||
}
|
||||
)
|
||||
return ret
|
||||
} else {
|
||||
const ret = await db.project_reports.update(
|
||||
req,
|
||||
{
|
||||
where: {}
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
}
|
||||
|
||||
async getByQueryWithAttrs (query, attrs, order) {
|
||||
const attrList = attrs ? attrs.split('-') : undefined
|
||||
const orderList = order ? order.split('-') : ['id', 'desc']
|
||||
console.log('getByQueryWithAttrs', query, attrs, order)
|
||||
const ret = await db.project_reports.findAndCountAll(
|
||||
{
|
||||
where: query,
|
||||
attributes: attrList,
|
||||
// group: group,
|
||||
order: [orderList]
|
||||
}
|
||||
)
|
||||
return ret
|
||||
}
|
||||
}
|
||||
|
||||
export default ProjectReport
|
||||
@@ -30,6 +30,8 @@ export default router
|
||||
.get('/api/file/collection/get/all', controllers.collection.getAll)
|
||||
.get('/api/file/collection/clear_deleted/', controllers.collection.clearDeleted)
|
||||
|
||||
.get('/api/file/collection/get', controllers.collection.get)
|
||||
|
||||
// meta
|
||||
.post('/api/file/meta/create', controllers.recordingDataMeta.create)
|
||||
.post('/api/file/meta/update/:id', controllers.recordingDataMeta.update)
|
||||
@@ -43,10 +45,12 @@ export default router
|
||||
.get('/api/file/meta/get_count_by_parent/:type/:parent', controllers.recordingDataMeta.getCountByParent)
|
||||
.get('/api/file/meta/get_by_parent_with_limit/:type/:parent/:limit/:offset/:order', controllers.recordingDataMeta.getByParentWithLimit)
|
||||
.get('/api/file/meta/get_by_attr_parent_with_limit/:type/:parent/:limit/:offset/:order/:attr', controllers.recordingDataMeta.getByAttrsParentWithLimit)
|
||||
|
||||
.get('/api/file/meta/get_or_create_by_path/:path', controllers.recordingDataMeta.getOrCreateByPath)
|
||||
.get('/api/file/meta/get/all', controllers.recordingDataMeta.getAll)
|
||||
|
||||
.get('/api/file/meta/find', controllers.recordingDataMeta.findWithIdRange)
|
||||
.get('/api/file/meta/get', controllers.recordingDataMeta.get)
|
||||
|
||||
// raw
|
||||
.post('/api/file/raw/create/:channel', controllers.recordingDataRaw.create)
|
||||
.post('/api/file/raw/update/:channel/:id', controllers.recordingDataRaw.update)
|
||||
@@ -112,6 +116,7 @@ export default router
|
||||
.post('/api/task/update_by_id/:id', controllers.task.updateByID)
|
||||
// analyze
|
||||
.post('/api/analysis/spike_detect', controllers.analysis.spikeDetect)
|
||||
.get('/api/analysis/get/csv', controllers.analysis.getCSV)
|
||||
|
||||
// project
|
||||
.post('/api/project/create', controllers.project.create)
|
||||
@@ -122,3 +127,19 @@ export default router
|
||||
.get('/api/project/get_by_id/:id', controllers.project.getByID)
|
||||
.get('/api/project/get_by_attr/:attr/:value', controllers.project.getByAttr)
|
||||
.get('/api/project/get/all', controllers.project.getAll)
|
||||
|
||||
// projectReport
|
||||
.post('/api/project/report/create', controllers.projectReport.create)
|
||||
.post('/api/project/report/update/:id', controllers.projectReport.update)
|
||||
.get('/api/project/report/get', controllers.projectReport.get)
|
||||
|
||||
// projectMeta
|
||||
.post('/api/project/meta/create', controllers.projectMeta.create)
|
||||
.post('/api/project/meta/update/:id', controllers.projectMeta.update)
|
||||
.get('/api/project/meta/get', controllers.projectMeta.get)
|
||||
|
||||
// configuration
|
||||
.post('/api/configuration/create', controllers.chart.create)
|
||||
.post('/api/configuration/update/:id', controllers.chart.update)
|
||||
.get('/api/configuration/get', controllers.chart.get)
|
||||
.get('/api/configuration/clear_deleted/', controllers.chart.clearDeleted)
|
||||
|
||||
Reference in New Issue
Block a user