From 17d041dc503c9c759c659e890c03218fd1a0cd32 Mon Sep 17 00:00:00 2001 From: Varun Date: Wed, 23 Apr 2025 21:37:13 +0530 Subject: [PATCH] changes --- src/controllers/tanksController.js | 38 +----------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index baefea3a..237703d0 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -6147,44 +6147,9 @@ async function processIotData(hw_Id, data) { const waterLevel = parseInt(waterLevelHeight * waterCapacityPerCm, 10); console.log(`🚰 Tank [${tankhardwareId}] - Level: ${tankHeight}, Calculated Water Level: ${waterLevel}`); - if (tankHeight <= 0) { - const now = moment().tz('Asia/Kolkata'); - const formattedNow = now.format('DD-MMM-YYYY - HH:mm:ss'); - - if (existingTank.slave_status !== "not_working") { - if (!existingTank.slave_disconnected_time) { - // First time signal is lost - existingTank.slave_status = "signal_lost"; - existingTank.slave_disconnected_time = formattedNow; - await existingTank.save(); - console.log(`⚠️ Slave signal lost for tank [${tankhardwareId}] at ${formattedNow}`); - } else if (existingTank.slave_status === "signal_lost") { - const disconnectedMoment = moment(existingTank.slave_disconnected_time, 'DD-MMM-YYYY - HH:mm:ss'); - if (!disconnectedMoment.isValid()) { - console.error(`❌ Invalid slave_disconnected_time format for tank [${tankhardwareId}]`); - } else { - const minutesDiff = now.diff(disconnectedMoment, 'minutes'); - console.log(`⏳ Minutes since disconnect for tank [${tankhardwareId}]: ${minutesDiff} min`); - - if (minutesDiff >= 5) { - existingTank.slave_status = "not_working"; - await existingTank.save(); - console.log(`❌ Slave marked as not_working for tank [${tankhardwareId}] after ${minutesDiff} minutes`); - } else { - console.log(`ℹ️ Still within 5-minute window for tank [${tankhardwareId}], no update yet`); - } - } - } - } else { - console.log(`⏩ Slave already marked as not_working for tank [${tankhardwareId}], skipping update`); - } - } - if (tankHeight > 0 && waterLevel >= 0) { existingTank.waterlevel = waterLevel; - existingTank.slave_status = "working"; - existingTank.slave_disconnected_time = null; await existingTank.save(); for (const outputConnection of existingTank.connections.outputConnections) { @@ -6224,7 +6189,6 @@ async function processIotData(hw_Id, data) { const startTime1 = moment().tz('Asia/Kolkata').format('DD-MMM-YYYY - HH:mm:ss'); const startInstanceId = `${hw_Id}${formattedTime}`; - inputConnection.motor_stop_status = "2"; inputConnection.motor_on_type = "forced_manual"; inputConnection.startTime = startTime1; @@ -7754,4 +7718,4 @@ exports.compareMeasuredHeight = async (req, reply) => { console.error("Error in compareMeasuredHeight:", err); reply.status(500).send({ message: err.message }); } -}; +}; \ No newline at end of file