diff --git a/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java b/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java index 2327506..f4ba7e1 100644 --- a/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java +++ b/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java @@ -35,9 +35,7 @@ public class DeviceInitService { new Thread(() -> { try { log.info("初始化开始"); - - initDeviceState(); - //缓存点位数据 +// initDeviceState(); log.info("初始化完毕"); } catch (Exception e) { throw new RuntimeException(e); @@ -58,8 +56,7 @@ public class DeviceInitService { for (ChannelCode code : ChannelCode.values()) { //初始化通道 Channel channel = channelService.getOne(new LambdaQueryWrapper<>(new Channel()).eq(Channel::getCode, code)); - Solution solution = solutionService.getById(channel.getSolutionId()); - ChannelState channelState = channelStateObjectProvider.getObject(code, channel.getVolume(), solution.getId(), solution.getName(), solution.getConcentration()); + ChannelState channelState = channelStateObjectProvider.getObject(code, channel.getVolume(), channel.getSolutionId(), channel.getSolutionName(), channel.getConcentration()); deviceState.getChannelStateMap().put(code, channelState); } log.info("初始化 initDeviceState完毕"); diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index 428bf2f..5a0e035 100644 --- a/src/main/resources/sql/init.sql +++ b/src/main/resources/sql/init.sql @@ -8,8 +8,8 @@ CREATE TABLE IF NOT EXISTS audit_record( concentration TEXT,--溶液浓度 channel_code TEXT,--通道code volume TEXT,--使用溶液量 - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP ); -- 领取记录(加液记录) @@ -20,8 +20,8 @@ CREATE TABLE IF NOT EXISTS receive_record ( solution_id INTEGER,--溶液id concentration TEXT,--溶液浓度 volume REAL,--领取量 - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP ); -- 通道 @@ -32,40 +32,40 @@ CREATE TABLE IF NOT EXISTS channel ( solution_id INTEGER,--绑定的溶液id concentration TEXT,--绑定的溶液浓度 volume REAL,--剩余溶液量 - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP ); INSERT OR IGNORE INTO channel ( - id, name, solution_id, code, volume + id, name, solution_id, concentration,code, volume ) VALUES - (1, '通道一', 1, 'CHANNEL_1', 5000), - (2, '通道二', 1, 'CHANNEL_2', 5000), - (3, '通道三', 1, 'CHANNEL_3', 5000), - (4, '通道四', 1, 'CHANNEL_4', 5000); + (1, '通道一', 1, 'CHANNEL_1','10', 5000), + (2, '通道二', 1, 'CHANNEL_2','10', 5000), + (3, '通道三', 1, 'CHANNEL_3','10', 5000), + (4, '通道四', 1, 'CHANNEL_4','10', 5000); -- 配方 CREATE TABLE IF NOT EXISTS formulation ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - volume REAL,--加液量 - solution_id INTEGER,--溶液id + id INTEGER PRIMARY KEY AUTOINCREMENT, + volume REAL,--加液量 + solution_id INTEGER,--溶液id concentration REAL,--溶液浓度 - revolutions REAL,--对应转数 - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + revolutions REAL,--对应转数 + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP ); -- 溶液 CREATE TABLE IF NOT EXISTS solution ( id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT,--溶液名称 - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP ); -INSERT OR IGNORE INTO solution (id, name, concentration, scale) VALUES - (1, '盐酸', 15, 1.1), - (2, '硫酸', 10, 1.2); +INSERT OR IGNORE INTO solution (id, name) VALUES + (1, '盐酸'), + (2, '硫酸'); -- 系统配置 @@ -74,8 +74,8 @@ CREATE TABLE IF NOT EXISTS system_config ( key TEXT, value TEXT, description TEXT, - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP ); -- 系统日志 @@ -83,8 +83,8 @@ CREATE TABLE IF NOT EXISTS system_log ( id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT, content TEXT, - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP ); -- 用户 @@ -96,8 +96,8 @@ CREATE TABLE IF NOT EXISTS user ( role TEXT,--角色 fixed_user TEXT DEFAULT 'DISABLE',--是否内置用户 deleted TEXT DEFAULT 'DISABLE',--逻辑删除 - create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP + create_time TEXT DEFAULT CURRENT_TIMESTAMP, + update_time TEXT DEFAULT CURRENT_TIMESTAMP );