Update README.md

README.md

@@ -1,6 +1,11 @@
 # BioProAPIServer
 
-### Setup pi3 postgresql
+### Setup postgresql
+
+##### Installation
+```
+sudo apt-get install postgresql libpq-dev postgresql-client postgresql-client-common
+```
 
 ##### Switch to the Postgres user to configure the database
 ```
@@ -14,11 +19,18 @@ createuser biopro -P --interactive
 
 ##### Postgres command (type psql first to connect postgres)
 ```
+#Enter postgresql
+psql
+
 #Find databases
 \l
 
 #Find tables
 \dt
+
+# Create new database and table if you need
+create database test
+test=> create table people (name text, company text)
 ```
 
 ### Run apiServer on device
@@ -39,11 +51,11 @@ change the code following as:
     change apiserver port to postgres port, 54321 --> 5432 (default)
 */
 export const pgDB = {
-  host: '127.0.0.1', // 服务器地址
-  port: 54321, // 数据库端口号 -----------------> 5432
-  username: 'biopro', // 数据库用户名
-  password: 'BioProControlBox', // 数据库密码
-  database: 'postgres' // 数据库名称
+  host: '127.0.0.1',
+  port: 54321, // -----------------> 5432
+  username: 'biopro',
+  password: 'BioProControlBox',
+  database: 'postgres'
 }
 ```
 
@@ -67,7 +79,7 @@ nohup node /home/pi/bioproapiserver/dist/app.js > /home/pi/.api_server.out &
 
 ##### Localhost test port binding (your device:54321 -> raspberrypi:5432)
 ```
-ssh -NL 54321:localhost:5432 pi@your-pi3-ip
+ssh -NL 54321:localhost:5432 pi@your-pi-ip
 ```
 
 ##### Run apiServer on your localhost (remember binding port first)
@@ -79,4 +91,4 @@ npm run start
 ```
 
 ##### References
->https://opensource.com/article/17/10/set-postgres-database-your-raspberry-pi
+>https://opensource.com/article/17/10/set-postgres-database-your-raspberry-pi

src/models/file/recording_data_meta.js

@@ -62,14 +62,8 @@ class RecordingDataMeta {
           recordingDataRaw.clearDeleted(channel)
         }
         if (meta.mini_data[channel] != null) {
-          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)
+          for (const miniID in meta.mini_data[channel]) {
+            await recordingDataMini.updateByIDs({ deleted: true }, meta.mini_data[channel][miniID], channel)
           }
           recordingDataMini.clearDeleted(channel)
         }

src/routes/main-routes.js

@@ -72,6 +72,7 @@ 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)

ssh_script.sh

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