kutafaja
/
klnodekb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vehicle_Getcity Javítva.

This commit is contained in:
Vincze József 2023-10-26 12:11:09 +02:00
parent c4c25a5eaf
commit 3cde74b5e8
5 changed files with 208 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deviceLog_2023_10_26.txt Normal file
View File

@ -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"}}},

186
js/access.js Normal file
View File

@ -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);
}
});*/

9
js/vehicleApi.js
View File

@ -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);
}
)
}
}

22
routes/employee.js
View File

@ -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
}
}

2
views/device_rfid_edit.pug
View File

@ -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 () {