diff --git a/sql/demo.sql b/sql/demo.sql index 6a542f4..b0cf2ff 100644 --- a/sql/demo.sql +++ b/sql/demo.sql @@ -102,7 +102,7 @@ CREATE TABLE IF NOT EXISTS crafts ( update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); --- 创建 crafts 实验 +-- 创建 tasks 实验 CREATE TABLE IF NOT EXISTS tasks ( id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR NOT NULL, @@ -114,15 +114,27 @@ CREATE TABLE IF NOT EXISTS tasks ( update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, is_deleted INTEGER ); --- 创建 crafts 容器 +-- 创建 container 容器 CREATE TABLE IF NOT EXISTS container ( id INTEGER PRIMARY KEY AUTOINCREMENT, type INTEGER, solution_id INTEGER, + pump_id TEXT, capacity_total INTEGER, capacity_used INTEGER ); --- 创建 crafts 日志 +INSERT INTO container (id, type, solution_id, pump_id, capacity_total, capacity_used) +VALUES +(1, 0, null, '1', 100, 0), +(2, 0, null, '2', 100, 0), +(3, 0, null, '3', 100, 0), +(4, 0, null, '4', 100, 0), +(5, 0, null, '5', 100, 0), +(6, 0, null, '6', 100, 0), +(7, 0, null, '7', 100, 0), +(8, 0, null, '8', 100, 0), +(9, 1, null, '9', 100, 0); +-- 创建 logs 日志 CREATE TABLE IF NOT EXISTS logs ( id INTEGER PRIMARY KEY AUTOINCREMENT, text TEXT @@ -130,7 +142,7 @@ CREATE TABLE IF NOT EXISTS logs ( create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); --- 创建 crafts 步骤记录 +-- 创建 task_steps 步骤记录 CREATE TABLE IF NOT EXISTS task_steps ( id INTEGER PRIMARY KEY AUTOINCREMENT, task_id INTEGER, diff --git a/src/main/java/com/qyft/gd/model/form/CMDForm.java b/src/main/java/com/qyft/gd/model/form/CMDForm.java index becea33..f1f442a 100644 --- a/src/main/java/com/qyft/gd/model/form/CMDForm.java +++ b/src/main/java/com/qyft/gd/model/form/CMDForm.java @@ -24,7 +24,7 @@ public class CMDForm { params : { // 添加溶液所需字段 tubeNum: 试管编号 - pumpId: 泵号 + solutions: 溶液id volume: 容量 // 关于温度 temperature: 温度 @@ -36,7 +36,7 @@ public class CMDForm { // 关于速度 speed : 速度 - areaId: 试管架id + areaId: 试管架id/加热盘id } */