From 733f075ff0abe57567d4e43e733e4d2b78b1378f Mon Sep 17 00:00:00 2001 From: maochaoying <925670706@qq.com> Date: Mon, 17 Apr 2023 10:34:11 +0800 Subject: [PATCH] 123 --- src/controller/config.controller.js | 24 ++++++++++++++++++++++-- src/service/config.service.js | 19 ++++++++++++++++++- src/websocket/client.js | 8 +++++++- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/controller/config.controller.js b/src/controller/config.controller.js index 21b9a21..907722e 100644 --- a/src/controller/config.controller.js +++ b/src/controller/config.controller.js @@ -12,8 +12,28 @@ class ConfigController { } async updateInfo(ctx, next) { - const { house_id, market_life_min } = ctx.request.body; - const res = await updateConfigInfoById(house_id, market_life_min); + const { + house_id, + market_life_min, + default_co2, + default_h2s, + default_nh3, + humidity_default_start, + humidity_default_end, + temperature_default_start, + temperature_default_end, + } = ctx.request.body; + const res = await updateConfigInfoById( + house_id, + market_life_min, + default_co2, + default_h2s, + default_nh3, + humidity_default_start, + humidity_default_end, + temperature_default_start, + temperature_default_end + ); ctx.body = Response(0, "更新鸡场配置信息成功", res); } } diff --git a/src/service/config.service.js b/src/service/config.service.js index f93ffdd..84d1b8c 100644 --- a/src/service/config.service.js +++ b/src/service/config.service.js @@ -23,10 +23,27 @@ class ConfigService { return res ? res.dataValues : null; } - async updateConfigInfoById(house_id, market_life_min) { + async updateConfigInfoById( + house_id, + market_life_min, + default_co2, + default_h2s, + default_nh3, + humidity_default_start, + humidity_default_end, + temperature_default_start, + temperature_default_end + ) { const res = await Config.update( { market_life_min, + default_co2, + default_h2s, + default_nh3, + humidity_default_start, + humidity_default_end, + temperature_default_start, + temperature_default_end, }, { where: { diff --git a/src/websocket/client.js b/src/websocket/client.js index 125f4fb..0987c0d 100644 --- a/src/websocket/client.js +++ b/src/websocket/client.js @@ -1,5 +1,11 @@ const WebSocket = require("ws"); -let ws = new WebSocket("ws://localhost:4000"); + +const { + WEB_SOCKET_PORT, + WEB_SOCKET_SERVER_HOST, +} = require("../config/config.default"); + +let ws = new WebSocket(`ws://${WEB_SOCKET_SERVER_HOST}:${WEB_SOCKET_PORT}`); // 打开WebSocket连接后立刻发送一条消息: ws.on("open", function () {