From ee3a7784a1441b5990f3517f786c032db3d91544 Mon Sep 17 00:00:00 2001 From: varun Date: Tue, 23 May 2023 04:53:16 -0400 Subject: [PATCH] made sump to sump start and stop --- src/controllers/tanksController.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index ce70137a..4e882515 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -222,6 +222,8 @@ exports.getTanklevels = async (req, reply) => { const intervals = {}; let sum_oh_count = 0 let bore_sump_count = 0 +let sump_sump_count = 0 + exports.motorAction = async (req, reply) => { try { //let start_time,stop_time @@ -381,6 +383,7 @@ exports.motorAction = async (req, reply) => { connection.motor_status = "1"; await sumpTank.save(); } + sump_sump_count++; // console.log(receiver_capacity,"0",receiver_tank_info.tankName) await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "1" } }); @@ -398,15 +401,14 @@ exports.motorAction = async (req, reply) => { const newSupplierWaterLevel = Math.min(supplier_capacity, supplier_waterlevel - 300);// Math.floor(supplier_waterlevel * 0.15)); // Check if updating should stop if ((newWaterLevel/receiver_capacity)*100 >= 97 || (newWaterLevel/receiver_capacity)*100 >= desired_water_percentage || rcvr_info.motor_status === "0" || (newSupplierWaterLevel/supplier_capacity)*100 <= 5 ) { - + clearInterval(intervals[interval_variable]); // Clear the interval for this tank - delete intervals[interval_variable]; - - - await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "0" } }); + delete intervals[interval_variable]; + sump_sump_count--; + if (sump_sump_count===0){ + await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "0" } }); + } - - console.log("end for" + receiver_tank); } else { // Update water levels in database @@ -536,8 +538,12 @@ exports.motorAction = async (req, reply) => { clearInterval(intervals[interval_variable]); // Clear the interval for this tank delete intervals[interval_variable]; if (supplier_tank_type === "sump" && receiver_type ==="sump"){ + + sump_sump_count--; + if (sump_sump_count===0){ + await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "0" } }); + } - await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "0" } }); }