From 84fd23e5e865bd5529441a0c318809a00362f44c Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期一, 18 三月 2024 16:15:03 +0800
Subject: [PATCH] 添加签收图片对比功能
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java
index 72b5a32..ddbed52 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java
@@ -18,6 +18,7 @@
import cn.exrick.xboot.your.service.ICarService;
import cn.exrick.xboot.your.service.IEventLogService;
import cn.exrick.xboot.your.util.FaceSystem;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -37,6 +38,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
//浜鸿劯姣斿妫�娴嬭溅鍘㈠紓甯稿紑鍚�
@@ -75,12 +77,26 @@
String targetAttrs = jsonObject1.get("targetAttrs").toString();
JSONObject jsonObject2 = JSONUtil.parseObj(targetAttrs);
String deviceName = jsonObject2.get("deviceName").toString();
- System.out.println(deviceName);
+ //System.out.println(deviceName);
QueryWrapper<Car> wrapper = new QueryWrapper<Car>();
wrapper.eq("car_no",deviceName.substring(0,deviceName.length()-1));
Car one = iCarService.getOne(wrapper);
if(one==null){
+ return;
+ }
+
+ Date date1 = new Date();
+ long time = date1.getTime()-2*60*1000;
+ Date date = new Date(time);
+ String format1 = DateUtil.format(date,"yyyy-MM-dd HH:mm:ss");
+ String format2 = DateUtil.format(date1,"yyyy-MM-dd HH:mm:ss");
+ QueryWrapper<Alarm> awrapper = new QueryWrapper<>();
+ awrapper.between("create_time",format1,format2);
+ awrapper.eq("car_no",one.getCarNo());
+ awrapper.eq("type",5);
+ List<Alarm> list = iAlarmService.list(awrapper);
+ if(list.size()>0){
return;
}
@@ -109,7 +125,7 @@
String avatar = user.getAvatar();
if(StrUtil.isNotEmpty(avatar)){
int result1 = FaceSystem.getResult(avatar, avatar2);
- if(result1<60){
+ if(result1<50){
flag++;
}else{
deleteFile(f.getId());//鏄竴涓汉鍒犻櫎鍥剧墖 flag=0
@@ -123,7 +139,7 @@
String avatar = user1.getAvatar();
if(StrUtil.isNotEmpty(avatar)){
int result1 = FaceSystem.getResult(avatar, avatar2);
- if(result1<60){
+ if(result1<50){
flag++;
}else{
deleteFile(f.getId());
@@ -150,7 +166,7 @@
}
} catch (Exception e) {
- System.out.println(e.toString());
+ //System.out.println(e.toString());
}
}
}
--
Gitblit v1.9.1