Arminta
/
watermanagement-backend-prod
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

Browse Source
master
bhaskar 2 years ago
parent b4d7e90013 78e4b3844f
commit d2fdcfbcd8
2 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File

5
src/controllers/createConnectionController.js
Unescape View File

@ -166,6 +166,11 @@ exports.getConnections = async (req, reply) => {
// exports.createConnectionsforOh = async (req, body) => { // exports.createConnectionsforOh = async (req, body) => {
// try { // try {
// const customerId = req.params.customerId; // const customerId = req.params.customerId;

90
src/controllers/tanksController.js
Unescape View File

@ -370,51 +370,51 @@ exports.motorAction = async (req, reply) => {
if(supplier_tank_type==="sump" && receiver_type === "sump"){ // if(supplier_tank_type==="sump" && receiver_type === "sump"){
const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) // const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10)
// console.log(receiver_capacity,"0",receiver_tank_info.tankName) // // console.log(receiver_capacity,"0",receiver_tank_info.tankName)
await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "1" } }); // await Tank.findOneAndUpdate({customerId, tankName: receiver_tank,tankLocation:receiver_type}, { $set: { motor_status: "1" } });
const supplier_tank_info = await Tank.findOne({ customerId ,tankName:supplier_tank,tankLocation:supplier_tank_type}); // const supplier_tank_info = await Tank.findOne({ customerId ,tankName:supplier_tank,tankLocation:supplier_tank_type});
let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10) // let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10)
let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) // let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10)
// console.log(receiver_waterlevel,"1") // // console.log(receiver_waterlevel,"1")
intervals[interval_variable] = setInterval(async function () { // intervals[interval_variable] = setInterval(async function () {
// Calculate new water levels // // Calculate new water levels
const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type}); // const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type});
const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10) // const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10)
// Calculate new water levels // // Calculate new water levels
const newWaterLevel = receiver_waterlevel + 300//Math.floor(supplier_waterlevel * 0.1); // const newWaterLevel = receiver_waterlevel + 300//Math.floor(supplier_waterlevel * 0.1);
const newSupplierWaterLevel = Math.min(supplier_capacity, supplier_waterlevel - 300);// Math.floor(supplier_waterlevel * 0.15)); // const newSupplierWaterLevel = Math.min(supplier_capacity, supplier_waterlevel - 300);// Math.floor(supplier_waterlevel * 0.15));
// Check if updating should stop // // 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 ) { // 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 // clearInterval(intervals[interval_variable]); // Clear the interval for this tank
delete intervals[interval_variable]; // delete intervals[interval_variable];
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" } });
console.log("end for" + receiver_tank); // console.log("end for" + receiver_tank);
} else { // } else {
// Update water levels in database // // Update water levels in database
supplier_waterlevel = newSupplierWaterLevel; // supplier_waterlevel = newSupplierWaterLevel;
receiver_waterlevel = newWaterLevel; // receiver_waterlevel = newWaterLevel;
console.log(supplier_waterlevel,"0") // console.log(supplier_waterlevel,"0")
console.log(receiver_waterlevel,"1") // console.log(receiver_waterlevel,"1")
// console.log((newSupplierWaterLevel/supplier_capacity)*100) // // console.log((newSupplierWaterLevel/supplier_capacity)*100)
// console.log((newWaterLevel/receiver_capacity)*100) // // console.log((newWaterLevel/receiver_capacity)*100)
await Promise.all([ // await Promise.all([
Tank.findOneAndUpdate({customerId, tankName: receiver_tank}, { $set: { waterlevel: newWaterLevel } }), // Tank.findOneAndUpdate({customerId, tankName: receiver_tank}, { $set: { waterlevel: newWaterLevel } }),
Tank.findOneAndUpdate({customerId, tankName: supplier_tank}, { $set: { waterlevel: newSupplierWaterLevel } }) // Tank.findOneAndUpdate({customerId, tankName: supplier_tank}, { $set: { waterlevel: newSupplierWaterLevel } })
]); // ]);
} // }
}, 2000); // }, 2000);
} // }

Write Preview
Loading…
Cancel
Save