From 3cde74b5e80d082b16ba2e5323aaffd86ff5a2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincze=20J=C3=B3zsef?= Date: Thu, 26 Oct 2023 12:11:09 +0200 Subject: [PATCH] =?UTF-8?q?Vehicle=5FGetcity=20Jav=C3=ADtva.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deviceLog_2023_10_26.txt | 5 + js/access.js | 186 +++++++++++++++++++++++++++++++++++++ js/vehicleApi.js | 9 +- routes/employee.js | 22 ++--- views/device_rfid_edit.pug | 2 +- 5 files changed, 208 insertions(+), 16 deletions(-) create mode 100644 deviceLog_2023_10_26.txt create mode 100644 js/access.js diff --git a/deviceLog_2023_10_26.txt b/deviceLog_2023_10_26.txt new file mode 100644 index 0000000..dbc3549 --- /dev/null +++ b/deviceLog_2023_10_26.txt @@ -0,0 +1,5 @@ +{"LOG":{"timeStamp":"2023.10.26 11:10:81","logName":"INVALID CODE","logMessage":"AC697422"}}, +{"LOG":{"timeStamp":"2023.10.26 11:10:63","logName":"ACCESS","logMessage":{"status":200,"data":"VALID CODE","employeeName":"Gipsz Jakab","message":"ÉRKEZÉS","city":"Szentpéterszeg,Dobó utca ","worktime":"","datetime":"11:56"}}}, +{"LOG":{"timeStamp":"2023.10.26 11:10:98","logName":"ACCESS","logMessage":{"status":200,"data":"VALID CODE","employeeName":"Gipsz Jakab","message":"TÁVOZÁS","city":"Szentpéterszeg,Dobó utca ","worktime":"00:00","datetime":"11:56"}}}, +{"LOG":{"timeStamp":"2023.10.26 11:10:99","logName":"ACCESS","logMessage":{"status":200,"data":"VALID CODE","employeeName":"Gipsz Jakab","message":"ÉRKEZÉS","city":"Szentpéterszeg,Dobó utca ","worktime":"","datetime":"11:56"}}}, +{"LOG":{"timeStamp":"2023.10.26 12:10:45","logName":"INVALID DEVICE","logMessage":{"cmd":"GETCITY","CID1":"4445687-878788-w7877","CID2":"45545-4545-25452-5548","loc":"G2","lat":"47.244455","lon":"21.624045000000002"}}}, diff --git a/js/access.js b/js/access.js new file mode 100644 index 0000000..87a786f --- /dev/null +++ b/js/access.js @@ -0,0 +1,186 @@ +// Esemény rögzítése +/*router.post('/access', async function(req,res){ + var response = { + status : 200, + data : 'INVALID QUERY' + } + var city='Ismeretlen'; + console.log(JSON.stringify(req.body)) + moment.locale('HU'); + if (req.body) + { + if (!req.body.clientID1 || !req.body.clientID2) + { + //console.log("Invalid Client ID!"); + createLog('INVALID CLIENT ID',req.body.clientID1+" "+req.body.clientID2); + response.status=200; + response.data='INVALID CLIENT ID'; + res.send(response); + } + else + { + + + if (!req.body.location) + { + response.status=200; + response.data='INVALID LOCATION'; + res.send(response); + } + else + { + if (req.body.mode!='ARRIVAL' && req.body.mode!='GETAWAY' && req.body.mode!='FREEDOM' && req.body.mode!='SICKPAY') + { + response.status=200; + response.data='INVALID MODE'; + res.send(response); + } + else + { + DeviceRemote.findOne({imei:req.body.clientID1,ccid:req.body.clientID2}, function(err,device){ + if (err) + { + response.status=200; + response.data='DB ERROR 1'; + res.send(response); + } + else + { + console.log(device) + if (typeof device === 'undefined' || !device ) + { + response.status=200; + response.data='INVALID DEVICE'; + //res.status(200).send('INVALID DEVICE!'); + res.send(response); + } + else + { + Employee.findOne({'accessCode':req.body.rfid},function(err,employee){ + + if(err) + { + response.status=200; + response.data='DB ERROR 1'; + res.send(response); + } + else + { + if (employee) + { + if (req.body.location==="0") // Ha a hlyzet GSM által meghatározott + { + // Lekérjük a város nevét + + //geocoder.reverse({lat:req.body.latitude, lon:req.body.longitude}, function(err, resp) { + hereGeocoding({lat:req.body.latitude, lon:req.body.longitude}, function(err, resp) { + if (err) + { + //response.status=200; + //response.data='GEOCODING ERROR!'; + //res.send(response); + //console.log('Geocoding error!'); + createLog('GEOCODING ERROR','LAT:'+req.body.latitude+' LON:'+req.body.longitude); + registerAccess(employee,'Ismeretlen',null,null,device,function(err,result){ + if (err) + { + console.log(err); + res.send(err); + } + else + { + checkIsHoliday(employee._id,moment().format('DD.MM.YYYY'),function(err,cb){ + if (err) + { + console.log('Holiday Split Error: '+err); + res.send(result); + } + else + { + res.send(result); + } + }); + + } + }) + } + if (resp) + { + city=resp.city;//resp[0].city; + registerAccess(employee,city,req.body.latitude,req.body.longitude,device,function(err,result){ + if (err) + { + console.log(err); + res.send(err); + } + else + { + checkIsHoliday(employee._id,moment().format('DD.MM.YYYY'),function(err,cb){ + if (err) + { + console.log('Holiday Split Error: '+err); + res.send(result); + } + else + { + res.send(result); + } + }); + } + }) + } + })//Geocoding end + } + else + { // Ha pozíció szöveges (fix telepítésű WiFi-nél) + registerAccess(employee,req.body.location,47.2449371,21.6238858,device,function(err,result){ + if (err) + { + console.log(err); + res.send(err); + } + else + { + checkIsHoliday(employee._id,moment().format('DD.MM.YYYY'),function(err,cb){ + if (err) + { + console.log('Holiday Split Error: '+err); + res.send(result); + } + else + { + res.send(result); + } + }); + } + }) + } + } + else + { + //console.log("Nincs munkavállaló ezzel az azonosítóval!"); + createLog('INVALID CODE',req.body.rfid); + response.status=200; + response.data='INVALID CODE'; + res.send(response); + } + }//else + }) + } + } + }); // Find Device + } + } + + } + } + else + { + response.status=200; + response.data='INVALID QUERY'; + res.send(response); + } + + +});*/ + \ No newline at end of file diff --git a/js/vehicleApi.js b/js/vehicleApi.js index e9dffb5..973cc8f 100644 --- a/js/vehicleApi.js +++ b/js/vehicleApi.js @@ -17,7 +17,12 @@ exports.apiVehicleSetCity=function(vehicleId,lastCity,rfid_device_id,callback){ }; - + if (!(vehicleId)) + { + callback(null,"No vehicle!") + } + else + { Vehicle.findByIdAndUpdate(vehicleId, {$push:{lastCity: lc}}, function(error,success) @@ -25,7 +30,7 @@ exports.apiVehicleSetCity=function(vehicleId,lastCity,rfid_device_id,callback){ callback(error,success); } ) - + } } diff --git a/routes/employee.js b/routes/employee.js index 25519a9..f9c9bdf 100644 --- a/routes/employee.js +++ b/routes/employee.js @@ -299,7 +299,10 @@ transporter = nodemailer.createTransport({ if(err) console.log(err); else - console.log(re); + { + if (re.name) + console.log(re.name); + } }) /* DeviceRemote.findOneAndUpdate({'imei':data.CID1,'ccid':data.CID2}, {$set:{'lastCity':resp.city}},function(err,device){ @@ -4247,7 +4250,7 @@ function registerAccess(employee,city,lat,lon,device, callback) } // Esemény rögzítése -router.post('/access', function(req,res){ +router.post('/access', async function(req,res){ var response = { status : 200, data : 'INVALID QUERY' @@ -4285,15 +4288,8 @@ router.post('/access', function(req,res){ } else { - DeviceRemote.findOne({imei:req.body.clientID1,ccid:req.body.clientID2}, function(err,device){ - if (err) - { - response.status=200; - response.data='DB ERROR 1'; - res.send(response); - } - else - { + const device=await DeviceRemote.findOne({imei:req.body.clientID1,ccid:req.body.clientID2})//, function(err,device){ + console.log(device) if (typeof device === 'undefined' || !device ) { @@ -4415,8 +4411,8 @@ router.post('/access', function(req,res){ }//else }) } - } - }); // Find Device + + } } diff --git a/views/device_rfid_edit.pug b/views/device_rfid_edit.pug index 9b7f7f8..a63ed0e 100644 --- a/views/device_rfid_edit.pug +++ b/views/device_rfid_edit.pug @@ -52,7 +52,7 @@ block content br input.btn.btn-primary(id='btnsave',class='disabled',type='submit',value='Mentés',tabindex='6') |     - a.btn.btn-success(href='/') Vissza + a.btn.btn-success(href='/devicesrfid/list') Vissza script. $(document).ready(function () {