This commit is contained in:
Pringgosutono
2025-11-14 12:24:00 +07:00
parent e01001be2b
commit b5c38b99f5
2 changed files with 8 additions and 9 deletions

View File

@ -16,7 +16,7 @@ Validator.useLang("en")
const devices = [] const devices = []
async function commitMessage(now, logDevice) { async function commitMessage(now, logDevice) {
console.log("Start commitMessage : ", logDevice.device_id) // console.log(logDevice.device_id + " : Start commitMessage")
try { try {
if (!logDevice.original_hex) { if (!logDevice.original_hex) {
return false return false
@ -49,8 +49,7 @@ async function commitMessage(now, logDevice) {
} }
if (["location"].includes(logDevice.action)) { if (["location"].includes(logDevice.action)) {
// console.log("logDevice:", logDevice) // console.log(logDevice.device_id + " : 1")
const lastHeartbeatOrAlarm = await GpsTracksModels.get2LastHeartbeatOrAlarm(logDevice.device_id) const lastHeartbeatOrAlarm = await GpsTracksModels.get2LastHeartbeatOrAlarm(logDevice.device_id)
if (lastHeartbeatOrAlarm.length > 0) { if (lastHeartbeatOrAlarm.length > 0) {
logDevice.ignition = lastHeartbeatOrAlarm[0].ignition logDevice.ignition = lastHeartbeatOrAlarm[0].ignition
@ -145,7 +144,7 @@ async function commitMessage(now, logDevice) {
// console.log(`GPS TRACKER UP LOCATION => device_id:${logDevice.device_id} vhc_id:${(vhc[0]) ? vhc[0].vid : 0}, distance_km:${distance_km}`); // 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 // validasi jika lebih dari 3km, ga disimpan
if (distance_km >= 3) { if (distance_km >= 3) {
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 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 return false
} }
logDevice.pre_milleage = distance_km logDevice.pre_milleage = distance_km

View File

@ -133,19 +133,19 @@ class GpsTracksModels {
} }
static bundleCreate2(logs = {}, rltm = {}) { static bundleCreate2(logs = {}, rltm = {}) {
console.log("Start bundleCreate2 : " + rltm.device_id) // console.log(rltm.device_id + " : Start bundleCreate2")
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
try { try {
const conn = await MysqlHelpers.createConnection() const conn = await MysqlHelpers.createConnection()
await MysqlHelpers.createTrx(conn) await MysqlHelpers.createTrx(conn)
console.log("createTrx : " + rltm.device_id) // console.log("createTrx : " + rltm.device_id)
let rltmLength = Object.keys(rltm).length let rltmLength = Object.keys(rltm).length
let resLogs = undefined let resLogs = undefined
if (Object.keys(logs).length > 0) { if (Object.keys(logs).length > 0) {
resLogs = await MysqlHelpers.queryTrx(conn, `INSERT INTO t_gps_tracks SET ?;`, [logs]) resLogs = await MysqlHelpers.queryTrx(conn, `INSERT INTO t_gps_tracks SET ?;`, [logs])
console.log("insert t_gps_tracks : " + rltm.device_id) // console.log("insert t_gps_tracks : " + rltm.device_id)
if (logs.action == "location") { if (logs.action == "location") {
const date = logs.crt_d const date = logs.crt_d
@ -160,7 +160,7 @@ class GpsTracksModels {
`, `,
[logs] [logs]
) )
console.log("insert tracks_${yy}${mm} : " + rltm.device_id) // console.log("insert tracks_${yy}${mm} : " + rltm.device_id)
} }
} }
@ -208,7 +208,7 @@ class GpsTracksModels {
} }
await MysqlHelpers.commit(conn) await MysqlHelpers.commit(conn)
console.log("Commit bundleCreate2 : " + rltm.device_id) // console.log("Commit bundleCreate2 : " + rltm.device_id)
resolve({ resolve({
type: "success", type: "success",
result: resLogs, result: resLogs,