From 224c221e6079713669a8f5cc38a230d73c1deded Mon Sep 17 00:00:00 2001 From: raj Date: Fri, 19 May 2023 05:20:09 +0000 Subject: [PATCH 1/3] changes --- src/api-docs/api.html | 3 +- src/api-docs/api.html.save | 67 ++++++++++++++++++++++++++++++++++++++ src/config/swagger.js | 3 +- 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 src/api-docs/api.html.save diff --git a/src/api-docs/api.html b/src/api-docs/api.html index dfbff504..068a77b4 100644 --- a/src/api-docs/api.html +++ b/src/api-docs/api.html @@ -49,7 +49,8 @@ show-header = 'false' allow-authentication ="true" > diff --git a/src/api-docs/api.html.save b/src/api-docs/api.html.save new file mode 100644 index 00000000..4bc403af --- /dev/null +++ b/src/api-docs/api.html.save @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/config/swagger.js b/src/config/swagger.js index 81456d6a..fa7556d0 100644 --- a/src/config/swagger.js +++ b/src/config/swagger.js @@ -15,7 +15,8 @@ exports.options = { // We have to change this beacause this is running on local // we have to run on this on swagger //host: "localhost:5000", //Devlopemnt host on lcoal - host: "35.207.198.4:3000", //Production for swagger + //host: "35.207.198.4:3000", //Production for swagger +host: "35.207.198.4:3000", schemes: ["http"], consumes: ["application/json"], produces: ["application/json"], From 56e4b322bfc3a8593094c854fd796ee3e16f4ac8 Mon Sep 17 00:00:00 2001 From: varun Date: Fri, 19 May 2023 02:11:35 -0400 Subject: [PATCH 2/3] made sump to sump start and stop --- src/controllers/tanksController.js | 76 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 96d85335..4025e6a8 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -370,51 +370,51 @@ exports.motorAction = async (req, reply) => { - // if(supplier_tank_type==="sump" && receiver_type === "sump"){ - // const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) - // // console.log(receiver_capacity,"0",receiver_tank_info.tankName) - // 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}); - - // let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10) - // let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) - // // console.log(receiver_waterlevel,"1") - // intervals[interval_variable] = setInterval(async function () { - // // Calculate new water levels - // const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type}); - // const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10) - // // Calculate new water levels - // 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)); - // // 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(supplier_tank_type==="sump" && receiver_type === "sump"){ + const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) + // console.log(receiver_capacity,"0",receiver_tank_info.tankName) + 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}); + + let supplier_waterlevel = parseInt(supplier_tank_info.waterlevel.replace(/,/g, ''), 10) + let receiver_waterlevel = parseInt(receiver_tank_info.waterlevel.replace(/,/g, ''), 10) + // console.log(receiver_waterlevel,"1") + intervals[interval_variable] = setInterval(async function () { + // Calculate new water levels + const rcvr_info = await Tank.findOne({ customerId ,tankName:receiver_tank,tankLocation:receiver_type}); + const supplier_capacity = parseInt(supplier_tank_info.capacity.replace(/,/g, ''), 10) + // Calculate new water levels + 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)); + // 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]; + 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" } }); + 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 + console.log("end for" + receiver_tank); + } else { + // Update water levels in database - // supplier_waterlevel = newSupplierWaterLevel; - // receiver_waterlevel = newWaterLevel; - // console.log(supplier_waterlevel,"0") - // console.log(receiver_waterlevel,"1") - // // console.log((newSupplierWaterLevel/supplier_capacity)*100) - // // console.log((newWaterLevel/receiver_capacity)*100) - // await Promise.all([ - // Tank.findOneAndUpdate({customerId, tankName: receiver_tank}, { $set: { waterlevel: newWaterLevel } }), - // Tank.findOneAndUpdate({customerId, tankName: supplier_tank}, { $set: { waterlevel: newSupplierWaterLevel } }) - // ]); - // } - // }, 2000); - - // } + supplier_waterlevel = newSupplierWaterLevel; + receiver_waterlevel = newWaterLevel; + console.log(supplier_waterlevel,"0") + console.log(receiver_waterlevel,"1") + // console.log((newSupplierWaterLevel/supplier_capacity)*100) + // console.log((newWaterLevel/receiver_capacity)*100) + await Promise.all([ + Tank.findOneAndUpdate({customerId, tankName: receiver_tank}, { $set: { waterlevel: newWaterLevel } }), + Tank.findOneAndUpdate({customerId, tankName: supplier_tank}, { $set: { waterlevel: newSupplierWaterLevel } }) + ]); + } + }, 2000); + + } From d7ee584aeb2c2b7687e24352c61b713c9eaf2fd8 Mon Sep 17 00:00:00 2001 From: varun Date: Fri, 19 May 2023 02:15:53 -0400 Subject: [PATCH 3/3] made sump to sump start and stop --- src/api-docs/api.html | 4 ++-- src/config/swagger.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api-docs/api.html b/src/api-docs/api.html index 068a77b4..185eda19 100644 --- a/src/api-docs/api.html +++ b/src/api-docs/api.html @@ -49,8 +49,8 @@ + spec-url="http://35.207.198.4:3000/documentation/json" + show-header = 'false' allow-authentication ="true" > diff --git a/src/config/swagger.js b/src/config/swagger.js index fa7556d0..04ebf510 100644 --- a/src/config/swagger.js +++ b/src/config/swagger.js @@ -14,9 +14,9 @@ exports.options = { }, // We have to change this beacause this is running on local // we have to run on this on swagger - //host: "localhost:5000", //Devlopemnt host on lcoal - //host: "35.207.198.4:3000", //Production for swagger -host: "35.207.198.4:3000", + //host: "localhost:3000", //Devlopemnt host on lcoal + + host: "35.207.198.4:3000", //Production for swagger schemes: ["http"], consumes: ["application/json"], produces: ["application/json"],