[update] down sample

src/config.js

@@ -25,7 +25,7 @@ export const DB = {
 
 export const pgDB = {
   host: '127.0.0.1', // 服务器地址
-  port: 5432, // 数据库端口号
+  port: 54321, // 数据库端口号
   username: 'biopro', // 数据库用户名
   password: 'BioProControlBox', // 数据库密码
   database: 'postgres' // 数据库名称

src/controllers/analysis/spikeDetect.py

@@ -1,5 +1,6 @@
 import sys
 import ast
+import time
 import psycopg2
 import numpy as np
 import pandas as pd
@@ -8,6 +9,21 @@ from math import ceil, floor
 from json import loads, dumps
 from scipy.fft import fft, fftfreq, rfft, rfftfreq, irfft, ifft
 
+import lttb
+from lttb.validators import has_two_columns, x_is_regular
+
+def get_downsampled_signal(ori_signal, output_length):
+  signal_length = len(ori_signal)
+  signal = np.array([range(signal_length), ori_signal]).T
+  assert signal.shape == (signal_length, 2)
+
+  # Downsampling
+  downsampled_signal = lttb.downsample(signal, n_out=output_length, validators=[has_two_columns, x_is_regular])
+  assert downsampled_signal.shape == (output_length, 2)
+  downsampled_signal_index = downsampled_signal[:, 0]
+  downsampled_signal_value = downsampled_signal[:, 1]
+  return downsampled_signal_index, downsampled_signal_value
+
 if __name__ == '__main__':
 
   params = {}
@@ -20,7 +36,7 @@ if __name__ == '__main__':
   cut_off_freq = int(params['cut_off_freq'])
   threshold = ast.literal_eval('[' + params['threshold'] + ']')
   waveform = ast.literal_eval('[' + params['waveform'] + ']')
-  SAMPLE_RATE = int(params['sample_rate'])
+  SAMPLE_RATE = int(float(params['sample_rate']))
   DURATION = ceil(float(params['time_duration']))
   DELTA_TIME = 1e6 / SAMPLE_RATE
   N = SAMPLE_RATE * DURATION
@@ -39,30 +55,22 @@ if __name__ == '__main__':
     print(e)
     exit
   finally:
-      time = np.array([], dtype=int)
-      data = np.array([])
+      timeArray = np.array([], dtype=int)
+      dataArray = np.array([])
 
       for sub_data in ret:
         for split_data in sub_data[0].split('"***"')[:-1]:
           value = np.array(split_data.split(' '))
-          time = np.append(time, value[::2].astype(np.int))
-          data = np.append(data, value[1::2].astype(np.int))
-
-      # print(len(time), len(data))
-      
+          timeArray = np.append(timeArray, value[::2].astype(np.int32))
+          dataArray = np.append(dataArray, value[1::2].astype(np.int32))
       xf = rfftfreq(N, 1 / SAMPLE_RATE)
       points_per_freq = len(xf) / (SAMPLE_RATE / 2)
       target_idx = int(points_per_freq * cut_off_freq)
 
       # print(xf[target_idx])
-
-      yf = rfft(data)
+      yf = rfft(dataArray)
       yf[:target_idx] = 0
-      new_sig = np.round(irfft(yf, len(data)),3)
-
-      # print(time[-1])
-      # print(len(datas))
-      # print(len(yf),yf)
+      new_sig = np.round(irfft(yf, len(dataArray)),3)
 
       if threshold[0] == 'below':
         th = new_sig < threshold[1]
@@ -77,23 +85,26 @@ if __name__ == '__main__':
       filter_array = []
       for idx, point in enumerate(thresholded_edge_indices):
         if idx > 0:
-          if time[thresholded_edge_indices[idx]] - int(waveform[2]) >= time[thresholded_edge_indices[idx-1]]:
+          if timeArray[thresholded_edge_indices[idx]] - int(waveform[2]) >= timeArray[thresholded_edge_indices[idx-1]]:
             filter_array.append(True)
-          elif time[thresholded_edge_indices[idx]] - int(waveform[1]) >= time[thresholded_edge_indices[idx-1]]:
+          elif timeArray[thresholded_edge_indices[idx]] - int(waveform[1]) >= timeArray[thresholded_edge_indices[idx-1]]:
             filter_array.append(True)
           else:
             filter_array.append(False)
         else:
-          if time[thresholded_edge_indices[idx]] - int(waveform[1]) < 0:
+          if timeArray[thresholded_edge_indices[idx]] - int(waveform[1]) < 0:
             filter_array.append(False)
           else:
             filter_array.append(True)
       
       timemark_list = thresholded_edge_indices[filter_array]
 
+      OUTPUT_SIGNAL_SIZE = 2000
+      downsampled_signal_index, downsampled_signal_value = get_downsampled_signal(new_sig, OUTPUT_SIGNAL_SIZE)
       if ret_data_type == 'all':
-        print(' '.join(str(x) for x in time))
-        print(' '.join(str(x) for x in new_sig))
+        print(' '.join(str(x) for x in timeArray))
+        print(' '.join(str(x) for x in downsampled_signal_index))
+        print(' '.join(str(x) for x in downsampled_signal_value))
         print(' '.join(str(x) for x in timemark_list))
       elif ret_data_type == 'partial':
         return_sub_signal_lists = {}

src/controllers/file/recording_data_meta.js

@@ -48,16 +48,6 @@ 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

src/controllers/file/recording_data_mini.js

@@ -61,15 +61,6 @@ 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

src/controllers/index.js

@@ -9,7 +9,6 @@ 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'
 
 export default {
   upload,
@@ -22,6 +21,5 @@ export default {
   recordingDataMeta,
   recordingDataRaw,
   recordingDataMini,
-  analysis,
-  project
+  analysis
 }

src/controllers/project/project.js

@@ -1,62 +0,0 @@
-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()
-}

src/db/database.js

@@ -27,7 +27,6 @@ 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.recording_data_metas = require('./schema/recording_data_meta.model')(sequelize, Sequelize)
 for (let i = 0; i < 32; i++) {
   db[i + '_recording_data_raws'] = require('./schema/recording_data_raw.model')(sequelize, Sequelize, i)
@@ -35,12 +34,12 @@ for (let i = 0; i < 32; 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()
 

src/db/schema/project.model.js

@@ -1,47 +0,0 @@
-module.exports = (sequelize, Sequelize) => {
-  const Project = sequelize.define('project', {
-    name: {
-      type: Sequelize.STRING
-    },
-    desc: {
-      type: Sequelize.STRING
-    },
-    task: {
-      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
-}

src/db/schema/recording_data_raw.model.js

@@ -43,6 +43,10 @@ module.exports = (sequelize, Sequelize, i) => {
       type: Sequelize.TEXT,
       defaultValue: ''
     },
+    sd_data: {
+      type: Sequelize.TEXT,
+      defaultValue: ''
+    },
     compressed: {
       type: Sequelize.BOOLEAN,
       defaultValue: false

src/models/file/recording_data_meta.js

@@ -62,8 +62,14 @@ class RecordingDataMeta {
           recordingDataRaw.clearDeleted(channel)
         }
         if (meta.mini_data[channel] != null) {
-          for (const miniID in meta.mini_data[channel]) {
-            await recordingDataMini.updateByIDs({ deleted: true }, meta.mini_data[channel][miniID], channel)
+          if (meta.mini_data[channel]['10'] !== undefined) {
+            await recordingDataMini.updateByIDs({ deleted: true }, meta.mini_data[channel]['10'], channel)
+          }
+          if (meta.mini_data[channel]['100'] !== undefined) {
+            await recordingDataMini.updateByIDs({ deleted: true }, meta.mini_data[channel]['100'], channel)
+          }
+          if (meta.mini_data[channel]['1000'] !== undefined) {
+            await recordingDataMini.updateByIDs({ deleted: true }, meta.mini_data[channel]['1000'], channel)
           }
           recordingDataMini.clearDeleted(channel)
         }
@@ -98,28 +104,7 @@ 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) {
+  async getCountByParent (type, parent) {
     const collectionType = type + '::jsonb'
     const parentOp = {}
     parentOp[collectionType] = {

src/models/file/recording_data_mini.js

@@ -31,11 +31,11 @@ class RecordingDataMini {
     return ret
   }
 
-  async clearDeleted (index, where = { deleted: true }) {
+  async clearDeleted (index) {
     const ret = await db[index + '_recording_data_minis'].destroy(
       {
         where: {
-          ...where
+          deleted: true
         }
       }
     )
@@ -69,17 +69,6 @@ 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(

src/models/file/recording_data_raw.js

@@ -37,11 +37,11 @@ class RecordingDataRaw {
     return ret
   }
 
-  async clearDeleted (index, where = { deleted: true }) {
+  async clearDeleted (index) {
     const ret = await db[index + '_recording_data_raws'].destroy(
       {
         where: {
-          ...where
+          deleted: true
         }
       }
     )

src/models/project/project.js

@@ -1,97 +0,0 @@
-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

src/routes/main-routes.js

@@ -39,7 +39,6 @@ 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)
@@ -65,7 +64,6 @@ 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)
@@ -74,7 +72,6 @@ export default router
 
   // device
   .post('/api/device/create', controllers.device.create)
-  .post('/api/device/update/:id', controllers.device.update)
   .post('/api/device/update/all', controllers.device.update)
   .post('/api/device/update_by_id/:id', controllers.device.updateByID)
   .post('/api/device/update_by_mac/:mac', controllers.device.updateByMac)
@@ -112,13 +109,3 @@ export default router
   .post('/api/task/update_by_id/:id', controllers.task.updateByID)
   // analyze
   .post('/api/analysis/spike_detect', controllers.analysis.spikeDetect)
-
-  // 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)

ssh_script.sh

@@ -1,3 +0,0 @@
-# Elite: 53
-# Neulive: 101 or 95
-ssh -NL 54321:localhost:5432 pi@192.168.2.1