From 7a402301c838927c235be20964aaf0fa0b2fb385 Mon Sep 17 00:00:00 2001 From: dongpd Date: Thu, 6 Feb 2020 11:35:49 +0700 Subject: [PATCH] fix compare plate --- api/controllers/ApiController.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/api/controllers/ApiController.js b/api/controllers/ApiController.js index 0e79068..2c9bb5b 100644 --- a/api/controllers/ApiController.js +++ b/api/controllers/ApiController.js @@ -137,12 +137,6 @@ exports.SaveLogs = async function (req, res) { } currentOut.push({"plate": req.body.plate, "time": currentTimestamp}); } - var query_plate_raw = await db.query("SELECT * FROM vehicle WHERE plate='" + req.body.plate + "'"); - - if (query_plate_raw.length == 0 && req.body.plate.length <= 7) { - res.send(vehicleInfo); - return; - } var fileName = req.body.plate + "_" + currentTimestamp + ".png"; var plateSaved = currentYear + "/" + currentMonth + "/" + currentDate + "/" + req.body.type + "/plate/" + fileName; @@ -151,6 +145,7 @@ exports.SaveLogs = async function (req, res) { await fs.writeFileSync(rootDir + plateSaved, req.body.plate_image, 'base64'); await fs.writeFileSync(rootDir + frameSaved, req.body.frame_image, 'base64'); + var query_plate_raw = await db.query("SELECT * FROM vehicle WHERE plate='" + req.body.plate + "'"); if (query_plate_raw.length > 0) { vehicleInfo = {"status": true, "data": query_plate_raw[0]}; if (req.body.type == "in") { @@ -165,7 +160,7 @@ exports.SaveLogs = async function (req, res) { } } } else { - var query_plate_levenshtein = await db.query("SELECT * FROM `vehicle` WHERE levenshtein('" + req.body.plate + "', `plate`) BETWEEN 0 AND 1 LIMIT 0,1"); + var query_plate_levenshtein = await db.query("SELECT * FROM `vehicle` WHERE LENGTH(`plate`)=" + req.body.plate.length + " AND levenshtein('" + req.body.plate + "', `plate`) BETWEEN 0 AND 1 LIMIT 0,1"); if (query_plate_levenshtein.length > 0) { vehicleInfo = {"status": true, "data": query_plate_levenshtein[0]}; if (req.body.type == "in") { @@ -180,6 +175,7 @@ exports.SaveLogs = async function (req, res) { } } } else { + vehicleInfo = {"status": true}; if (req.body.type == "in") { await db.query("INSERT INTO logs_unknow(`plate`,`plate_image_in`,`frame_image_in`,`time_in`) VALUES ('" + req.body.plate + "','" + plateSaved + "','" + frameSaved + "'," + currentTimestamp + ")"); }