diff --git a/controllers/ListenController.js b/controllers/ListenController.js index 6541795..07cf7c5 100644 --- a/controllers/ListenController.js +++ b/controllers/ListenController.js @@ -143,11 +143,11 @@ async function commitMessage(now, logDevice) { ) const distance_km = LibHelper.kmToKm(distance, 100000000) // console.log(`GPS TRACKER UP LOCATION => device_id:${logDevice.device_id} vhc_id:${(vhc[0]) ? vhc[0].vid : 0}, distance_km:${distance_km}`); - // validasi jika lebih dari 3km, ga disimpan - if (distance_km >= 3) { - await GpsTracksModels.bundleCreate2(logDevice, logDevice) // jika tidak disimpan malah jadi bug, jadi akan update lokasi terus dengan kalkulasi jarak sebelumnya jadi makan lama makin lebar, mending disimpen terus milleagenya jadi 0 aja - return false - } + // // validasi jika lebih dari 3km, ga disimpan + // if (distance_km >= 3) { + // await GpsTracksModels.bundleCreate2(logDevice, logDevice) // jika tidak disimpan malah jadi bug, jadi akan update lokasi terus dengan kalkulasi jarak sebelumnya jadi makan lama makin lebar, mending disimpen terus milleagenya jadi 0 aja + // return false + // } logDevice.pre_milleage = distance_km logDevice.sum_milleage = (lastTrack[0].sum_milleage + logDevice.pre_milleage).toFixed(8) if (vhc.length > 0) { @@ -464,6 +464,7 @@ class ListenController { try { const imei = req.body.imei.toString().padStart(16, "0") const records = req.body.records + // console.log(`📍 Teltonika data received from device IMEI: ${imei}, records : ${JSON.stringify(records)}`) // for (const rec of records) { // console.log( @@ -523,14 +524,11 @@ class ListenController { crt_d_format: moment.unix(timestamp_device).format("YYYY-MM-DD HH:mm:ss"), crt_s: now, crt_s_format: moment.unix(now).format("YYYY-MM-DD HH:mm:ss"), - fuel_curr: - rec.io["Fuel Level"] === 0 && isSleepMode - ? lastTrack?.fuel_curr ?? 0 - : rec.io["Fuel Level"] ?? 0, + fuel_curr: !rec.io["Fuel Level"] && isSleepMode ? lastTrack?.fuel_curr : rec.io["Fuel Level"] || 0, fuel_count: - rec.io["Fuel Consumed (counted)"] === 0 && isSleepMode - ? lastTrack?.fuel_count ?? 0 - : rec.io["Fuel Consumed (counted)"] ?? 0, + !rec.io["Fuel Consumed (counted)"] && isSleepMode + ? lastTrack?.fuel_count + : rec.io["Fuel Consumed (counted)"] || 0, } await commitMessage(now, logDevice).then(() => {