Compare commits

...

30 Commits

Author SHA1 Message Date
peterlu14 f7f270a18a feat: add bytea_data field to recording_data_raw model
- Add a `bytea_data` field to the `recording_data_raw` model with default value as an empty buffer.

Signed-off-by: peterlu14 <peterlu810516@gmail.com>
2024-01-23 15:50:59 +08:00
peterlu14 917380a961 -add configuration table 2023-05-11 15:14:44 +08:00
peterlu14 7d2e8009b6 -fix return result 2023-04-27 11:54:01 +08:00
peterlu14 c277d7c94c -update findWithIdRange1 return result 2023-04-27 11:41:14 +08:00
peterlu14 d93633704e -update add meta findWithIdRange 2023-04-10 09:16:32 +08:00
peterlu14 87bcb29242 [update] add limit in query meta table 2023-01-12 09:49:03 +08:00
peterlu14 442eb1eed5 [update] count result from project table 2023-01-12 09:47:14 +08:00
10 0a0608aa09 [update] add api for downloading analysis file 2023-01-06 13:11:26 +08:00
peterlu14 423a56466a [update] add get by project 2023-01-03 15:44:36 +08:00
peterlu14 eb79905024 [debug] fix recording_data_metas add column project 2022-12-30 15:07:46 +08:00
peterlu14 853cf888de [debug] fix serial_number wrong default 2022-12-30 14:57:58 +08:00
peterlu14 3ee4d5a118 [update] add api for table project_metas 2022-12-28 14:08:14 +08:00
peterlu14 37e13ca93f [update] add api for table project_reports 2022-12-28 13:44:57 +08:00
peterlu14 59ebcb946e [update] add meta with time query & group by time & project 2022-12-28 11:35:55 +08:00
peterlu14 4a6587530c [update] add new collection get api & support all old apis 2022-12-27 11:40:09 +08:00
peterlu14 c264157a15 [update] add new meta get api support all old apis 2022-12-08 16:33:29 +08:00
peterlu14 be1500bbbc [update] add project cycle column 2022-09-28 11:21:14 +08:00
108000207 5d5bf0ee51 [update] differential done 2022-08-23 17:51:21 +08:00
108000207 cf83afc8f3 [update] integral functional done 2022-08-23 17:02:23 +08:00
108000207 c8d0248da1 [update] log functional done 2022-08-23 15:32:00 +08:00
108000207 830fde89a3 [update] support multi "***" and export csv 2022-08-23 13:48:17 +08:00
108000207 fcc76c835c [update] sql get DB and build dataFrame 2022-08-23 11:07:01 +08:00
peterlu14 2937043f78 Merge branch 'feature/project_setting' into release/v1.0.0_project 2022-05-06 10:53:29 +08:00
peterlu14 1f65ad0f11 [update] fix update project 2022-04-29 17:17:03 +08:00
peterlu14 18c61c0996 [update] add new feature project api 2022-04-27 16:10:40 +08:00
peterlu14 451d246952 [update] init_setting 2022-04-15 17:47:39 +08:00
peterlu14 15d6c2cda6 [update] add meta getattrbyparent 2022-04-15 17:47:21 +08:00
peterlu14 5ad6683b81 [update] remove sd_card column 2021-10-19 10:45:30 +08:00
Jordan Hsu a646844b9a Merge branch 'master' into release/for_elite 2021-10-18 17:48:53 +08:00
Jordan Hsu 97993827b2 [update] api for checking if mini have data 2021-09-10 20:10:08 +08:00
33 changed files with 58146 additions and 16 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ export const DB = {
export const pgDB = {
host: '127.0.0.1', // 服务器地址
port: 54321, // 数据库端口号
port: 5432, // 数据库端口号
username: 'biopro', // 数据库用户名
password: 'BioProControlBox', // 数据库密码
database: 'postgres' // 数据库名称
+11
View File
@@ -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()
}
+39
View File
@@ -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()
}
+27
View File
@@ -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)
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+105
View File
@@ -0,0 +1,105 @@
import psycopg2
import pandas as pd
import numpy as np
def log(df, channel):
# TODO: not sure need use 32 or 64?
df[f'{channel}_log'] = np.log10(np.absolute(df[channel].astype(np.int32)))
return df
def integral(df, x_channel, y_channel, pre_last_x, pre_last_y, integral_result):
offset = df[x_channel]
offset = offset.shift(periods=1)
offset[0] = pre_last_x
x_diff = df[x_channel].astype(np.int32) - offset.astype(np.int32)
# print('x_diff\n', x_diff)
offset = df[y_channel]
offset = offset.shift(periods=1)
offset[0] = pre_last_y
y_avg = (offset.astype(np.int32) + df[y_channel].astype(np.int32)) / 2
# print('y_avg:', y_avg)
# print('y_avg: ', y_avg)
local_integral = x_diff * y_avg
local_integral[0] += integral_result
# TODO: if user don't need, then can remove it
df[f'{x_channel}_{y_channel}_integral_delta'] = local_integral
df[f'{x_channel}_{y_channel}_integral'] = local_integral.cumsum()
# print(df)
pre_last_x = df[x_channel].iat[-1]
pre_last_y = df[y_channel].iat[-1]
integral_result = df[f'{x_channel}_{y_channel}_integral'].iat[-1]
# print('next run info: ', pre_last_x, pre_last_y, integral_result)
return df, pre_last_x, pre_last_y, integral_result
def differential(df, x_channel, y_channel, pre_last_x, pre_last_y):
offset = df[x_channel]
offset = offset.shift(periods=1)
offset[0] = pre_last_x
x_diff = df[x_channel].astype(np.int32) - offset.astype(np.int32)
offset = df[y_channel]
offset = offset.shift(periods=1)
offset[0] = pre_last_y
y_diff = df[y_channel].astype(np.int32) - offset.astype(np.int32)
local_diff = y_diff / x_diff
print(local_diff)
# TODO: if user don't need, then can remove it
df[f'{x_channel}_{y_channel}_diff'] = local_diff
pre_last_x = df[x_channel].iat[-1]
pre_last_y = df[y_channel].iat[-1]
return df, pre_last_x, pre_last_y
if __name__ == '__main__':
# TODO: function parameters: id, mode, x_channel, y_channel
conn = psycopg2.connect(database="postgres", user="biopro", password="BioProControlBox", host="127.0.0.1", port="5432")
cur = conn.cursor()
id = 1262
# id = 407
# id = 1073
# id = 968
mode = 'differential'
# mode = 'integral'
# mode = 'log'
sql_str = f'select "raw_data" from "recording_data_metas" WHERE id = {id}' # recording_data_metas: meta info to get the raw_data table
# sql_str = 'select "raw_data" from "recording_data_metas" WHERE id = 407' # recording_data_metas: meta info to get the raw_data table
# sql_str = 'select * from "0_recording_data_raws" WHERE id = 33384'
cur.execute(sql_str)
raw_data_list = None
# x_
try:
raw_data_list = cur.fetchall()[0][0]
# print(ret[0][0]['0'])
channels = list(raw_data_list.keys())
df = pd.DataFrame()
df_time = []
pre_last_x = 0
pre_last_y = 0
integral_result = 0
# print('len(raw_data_list[channels[0]]): ', len(raw_data_list[channels[0]]))
for raw_data_pages in range(len(raw_data_list[channels[0]])):
for channel in channels:
sql_str = f'select "data" from "{channel}_recording_data_raws" WHERE id = {raw_data_list[channel][raw_data_pages]}'
cur.execute(sql_str)
data_value = cur.fetchall()[0][0].replace('"***"', ' ')
data_value = data_value.split(' ')[:-1]
if df.empty:
df_time = data_value[::2]
df[channel] = data_value
df = df.iloc[lambda x: x.index % 2 == 1].reset_index(drop=True)
df.insert(0, 'time', df_time)
if mode == 'log':
x_channel = '1'
df = log(df, x_channel)
elif mode == 'integral':
# TODO: x_channel and y_channel will need to be set as parameters
x_channel = 'time'
y_channel = '0'
df, pre_last_x, pre_last_y, integral_result = integral(df, x_channel, y_channel, pre_last_x, pre_last_y, integral_result)
elif mode == 'differential':
x_channel = '1'
y_channel = '0'
df, pre_last_x, pre_last_y = differential(df, x_channel, y_channel, pre_last_x, pre_last_y)
# print(df)
df.to_csv(f"csv_test/{id}.csv", mode='a', index=False, header=False)
df = pd.DataFrame()
except BaseException as e:
print(e)
exit
@@ -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)
@@ -48,6 +91,16 @@ export const getByParent = async (ctx, next) => {
next()
}
export const getAttrByParent = async (ctx, next) => {
const type = ctx.params.type
const parent = ctx.params.parent
const attr = ctx.params.attr
const result = await recordingDataMeta.getByAttrParent(type, parent, attr)
ctx.body = result
next()
}
export const getCountByParent = async (ctx, next) => {
const type = ctx.params.type
const parent = ctx.params.parent
@@ -61,6 +61,15 @@ export const getByID = async (ctx, next) => {
next()
}
export const getExistOrNotByID = async (ctx, next) => {
const index = ctx.params.channel
const id = ctx.params.id
const result = await recordingDataMini.getExistOrNotByID(id, index)
ctx.body = result
next()
}
export const getByIDs = async (ctx, next) => {
const index = ctx.params.channel
const id = ctx.params.id
+60
View File
@@ -0,0 +1,60 @@
time 0 1 2 3 time_0_integral
0 0 -73922 -836265 -848970 0 0.000000e+00
1 10500 -84368 -834380 -848548 0 -8.310225e+08
2 21000 -84389 -834380 -848126 0 -1.716997e+09
3 31500 -84332 -835637 -847704 0 -2.602782e+09
4 42500 -84166 -835637 -847283 0 -3.529521e+09
... ... ... ... ... .. ...
1462 15390500 -45761 -449806 -466674 0 -9.716838e+11
1463 15401000 -45833 -449806 -466445 0 -9.721646e+11
1464 15411500 -45790 -451063 -466216 0 -9.726457e+11
1465 15422500 -45638 -449806 -465988 0 -9.731485e+11
1466 15432500 -45674 -449806 -465759 0 -9.736051e+11
[1467 rows x 6 columns]
next run info: 15432500 -45674 -973605066500.0
time 0 1 2 3 time_0_integral
0 15443000 -45689 -448549 -465531 0 -9.740847e+11
1 15453500 -45689 -448549 -465531 0 -9.745645e+11
2 15464000 -45631 -449178 -465303 0 -9.750439e+11
3 15474500 -45581 -447921 -465075 0 -9.755227e+11
4 15485500 -45646 -447921 -464847 0 -9.760245e+11
... ... ... ... ... .. ...
1443 30720000 -24971 -248122 -259749 0 -1.497382e+12
1444 30730500 -24920 -247950 -259624 0 -1.497644e+12
1445 30741000 -24920 -248381 -259624 0 -1.497905e+12
1446 30751500 -24791 -248036 -259500 0 -1.498166e+12
1447 30762000 -24856 -247346 -259376 0 -1.498427e+12
[1448 rows x 6 columns]
next run info: 30762000 -24856 -1498426872750.0
time 0 1 2 3 time_0_integral
0 30772500 -24913 -247669 -259251 0 -1.498688e+12
1 30783000 -24848 -247669 -259127 0 -1.498949e+12
2 30794000 -24805 -247669 -259003 0 -1.499222e+12
3 30804000 -24805 -247454 -259003 0 -1.499471e+12
4 30814500 -24870 -247238 -258879 0 -1.499731e+12
... ... ... ... ... .. ...
1456 46091500 -13496 -134943 -147002 0 -1.783935e+12
1457 46102000 -13510 -134921 -146934 0 -1.784077e+12
1458 46112500 -13510 -134123 -146934 0 -1.784219e+12
1459 46123000 -13597 -134339 -146866 0 -1.784361e+12
1460 46134000 -13525 -134598 -146799 0 -1.784510e+12
[1461 rows x 6 columns]
next run info: 46134000 -13525 -1784510350500.0
time 0 1 2 3 time_0_integral
0 46144500 -13366 -134210 -146732 0 -1.784652e+12
1 46154500 -13460 -134210 -146665 0 -1.784786e+12
2 46165500 -13503 -134016 -146597 0 -1.784934e+12
3 46176000 -13503 -134102 -146597 0 -1.785076e+12
4 46186500 -13431 -134167 -146530 0 -1.785217e+12
.. ... ... ... ... .. ...
583 52277500 -10487 -105193 -117883 0 -1.858083e+12
584 52288000 -10573 -105042 -117830 0 -1.858194e+12
585 52298500 -10595 -105106 -117778 0 -1.858305e+12
586 52309000 -10494 -105085 -117725 0 -1.858415e+12
587 52319500 -10523 -105085 -117672 0 -1.858526e+12
[588 rows x 6 columns]
next run info: 52319500 -10523 -1858525771000.0
+9 -1
View File
@@ -9,6 +9,10 @@ import * as recordingDataMeta from './file/recording_data_meta'
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,
@@ -21,5 +25,9 @@ export default {
recordingDataMeta,
recordingDataRaw,
recordingDataMini,
analysis
analysis,
project,
projectReport,
projectMeta,
chart
}
+62
View File
@@ -0,0 +1,62 @@
import ProjectModal from '../../models/project/project'
const project = new ProjectModal()
export const create = async (ctx, next) => {
const data = ctx.request.body
console.log('create', data)
const result = await project.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 project.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 project.updateByAttr(attr, value)
ctx.body = result
next()
}
export const clearDeleted = async (ctx, next) => {
const result = await project.clearDeleted()
ctx.body = result
next()
}
export const getByID = async (ctx, next) => {
const index = ctx.params.channel
const id = ctx.params.id
const result = await project.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 project.getByAttr(attr, value)
ctx.body = result
next()
}
export const getAll = async (ctx, next) => {
const result = await project.getAll()
ctx.body = result
next()
}
+82
View File
@@ -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()
}
+82
View File
@@ -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()
}
+10 -6
View File
@@ -27,19 +27,23 @@ db.controllers = require('./schema/controller.model')(sequelize, Sequelize)
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)
}
for (let i = 0; i < 32; i++) {
db[i + '_recording_data_minis'] = require('./schema/recording_data_mini.model')(sequelize, Sequelize, i)
}
for (let i = 256; i < 288; i++) {
db[i + '_recording_data_raws'] = require('./schema/recording_data_raw.model')(sequelize, Sequelize, i)
}
for (let i = 256; i < 288; i++) {
db[i + '_recording_data_minis'] = require('./schema/recording_data_mini.model')(sequelize, Sequelize, i)
}
// for (let i = 256; i < 288; i++) {
// db[i + '_recording_data_raws'] = require('./schema/recording_data_raw.model')(sequelize, Sequelize, i)
// }
// for (let i = 256; i < 288; i++) {
// db[i + '_recording_data_minis'] = require('./schema/recording_data_mini.model')(sequelize, Sequelize, i)
// }
db.sequelize.sync()
+47
View File
@@ -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
}
+51
View File
@@ -0,0 +1,51 @@
module.exports = (sequelize, Sequelize) => {
const Project = sequelize.define('project', {
name: {
type: Sequelize.STRING
},
desc: {
type: Sequelize.STRING
},
task: {
type: Sequelize.JSONB,
defaultValue: {}
},
cycle: {
type: Sequelize.JSONB,
defaultValue: []
},
device: {
type: Sequelize.JSONB,
defaultValue: {}
},
uuid: {
type: Sequelize.STRING,
defaultValue: ''
},
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 Project
}
+35
View File
@@ -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
}
+52
View File
@@ -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: {}
+3 -3
View File
@@ -43,9 +43,9 @@ module.exports = (sequelize, Sequelize, i) => {
type: Sequelize.TEXT,
defaultValue: ''
},
sd_data: {
type: Sequelize.TEXT,
defaultValue: ''
bytea_data: {
type: Sequelize.BLOB,
defaultValue: Buffer.alloc(0) // Empty Buffer
},
compressed: {
type: Sequelize.BOOLEAN,
+79
View File
@@ -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
+38
View File
@@ -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) {
+278
View File
@@ -98,6 +98,27 @@ class RecordingDataMeta {
return ret
}
async getByAttrParent (type, parent, attr) {
const attrList = attr.split('-')
const collectionType = type + '::jsonb'
const parentOp = {}
parentOp[collectionType] = {
[Op.contains]: '[' + parent + ']'
}
const ret = await db.recording_data_metas.findAll(
{
where: {
parent: parentOp
},
attributes: attrList,
order: [
['id', 'DESC']
]
}
)
return ret
}
async getCountByParent (type, parent) {
const collectionType = type + '::jsonb'
const parentOp = {}
@@ -225,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
+13 -2
View File
@@ -31,11 +31,11 @@ class RecordingDataMini {
return ret
}
async clearDeleted (index) {
async clearDeleted (index, where = { deleted: true }) {
const ret = await db[index + '_recording_data_minis'].destroy(
{
where: {
deleted: true
...where
}
}
)
@@ -69,6 +69,17 @@ class RecordingDataMini {
return ret
}
async getExistOrNotByID (id, index) {
const ret = await db[index + '_recording_data_minis'].findOne(
{
where: {
id: id
}
}
).then(token => !(token.data_mean === ''))
return ret
}
async getByIDs (id, index) {
const _id = JSON.parse('[' + id + ']')
const ret = await db[index + '_recording_data_minis'].findAllWithStream(
+2 -2
View File
@@ -37,11 +37,11 @@ class RecordingDataRaw {
return ret
}
async clearDeleted (index) {
async clearDeleted (index, where = { deleted: true }) {
const ret = await db[index + '_recording_data_raws'].destroy(
{
where: {
deleted: true
...where
}
}
)
+97
View File
@@ -0,0 +1,97 @@
const db = require('../../db/database')
// const Op = db.Sequelize.Op
class ProjectModal {
async create (req) {
return db.projects.create(req)
}
async update (req, id) {
if (id != null) {
const ret = await db.projects.update(
req,
{
where: {
id: id
}
}
)
return ret
} else {
const ret = await db.projects.update(
req,
{
where: {}
}
)
return ret
}
}
async updateByAttr (req, attr, value) {
const whereObj = {}
const attrList = attr.split('-')
const valueList = value.split('-')
attrList.forEach((key, idx) => {
whereObj[key] = valueList[idx]
})
const ret = await db.projects.update(
req,
{
where: whereObj
}
)
return ret
}
async clearDeleted () {
const ret = await db.projects.destroy(
{
where: {
deleted: true
}
}
)
return ret
}
async getByID (id) {
const ret = await db.projects.findAll(
{
where: {
id: id
}
}
)
return ret
}
async getByAttr (attr, value) {
const attrList = attr.split('-')
const valueList = value.split('-')
const whereObj = {}
attrList.forEach((key, idx) => {
whereObj[key] = valueList[idx]
})
const ret = await db.projects.findAll(
{
where: whereObj
}
)
return ret
}
async getAll () {
const ret = await db.projects.findAll({
order: [
['created_at', 'ASC']
]
})
return ret
}
}
export default ProjectModal
+46
View File
@@ -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
+46
View File
@@ -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
+34 -1
View File
@@ -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)
@@ -39,13 +41,16 @@ export default router
.get('/api/file/meta/get_by_id/:id', controllers.recordingDataMeta.getByID)
.get('/api/file/meta/get_by_path/:path', controllers.recordingDataMeta.getByPath)
.get('/api/file/meta/get_by_parent/:type/:parent', controllers.recordingDataMeta.getByParent)
.get('/api/file/meta/get_attr_by_parent/:type/:parent/:attr', controllers.recordingDataMeta.getAttrByParent)
.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)
@@ -64,6 +69,7 @@ export default router
.post('/api/file/mini/update/:channel/:id', controllers.recordingDataMini.update)
.get('/api/file/mini/clear_deleted/:channel/:id', controllers.recordingDataMini.clearDeleted)
.get('/api/file/mini/get_by_id/:channel/:id', controllers.recordingDataMini.getByID)
.get('/api/file/mini/get_exist_or_not_by_id/:channel/:id', controllers.recordingDataMini.getExistOrNotByID)
.get('/api/file/mini/get_by_parent/:channel/:parent', controllers.recordingDataMini.getByParent)
.get('/api/file/mini/get_attr_by_id/:channel/:id/:attr', controllers.recordingDataMini.getAttrByID)
.get('/api/file/mini/get_attr_by_parent/:channel/:parent/:attr', controllers.recordingDataMini.getAttrByParent)
@@ -110,3 +116,30 @@ 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)
.post('/api/project/update/:id', controllers.project.update)
.post('/api/project/update_by_attr/:attr/:value', controllers.project.updateByAttr)
.post('/api/project/update/all', controllers.project.update)
.get('/api/project/clear_deleted/:controller_id', controllers.project.clearDeleted)
.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)