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 | 65 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 15 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 88a6fc6..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
@@ -13,9 +13,12 @@
import cn.exrick.xboot.file.service.FileService;
import cn.exrick.xboot.your.entity.Alarm;
import cn.exrick.xboot.your.entity.Car;
+import cn.exrick.xboot.your.entity.EventLog;
import cn.exrick.xboot.your.service.IAlarmService;
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;
@@ -35,9 +38,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
-
+//浜鸿劯姣斿妫�娴嬭溅鍘㈠紓甯稿紑鍚�
@RestController
@RequestMapping("/hk")
public class FaceImgController {
@@ -56,6 +60,8 @@
private IAlarmService iAlarmService;
@Autowired
private RedisTemplateHelper redisTemplate;
+ @Autowired
+ private IEventLogService iEventLogService;
@RequestMapping(value = "/faceImg", method = RequestMethod.POST)
@@ -71,11 +77,28 @@
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;
+ }
User user = userService.get(one.getUserId());
User user1 = userService.get(one.getFollowUserId());
@@ -100,25 +123,31 @@
String avatar2 = os.getHttp() + os.getEndpoint() + "/" + f.getId();
if(user!=null){
String avatar = user.getAvatar();
- int result1 = FaceSystem.getResult(avatar, avatar2);
- if(result1<70){
- flag++;
- }else{
- deleteFile(f.getId());
+ if(StrUtil.isNotEmpty(avatar)){
+ int result1 = FaceSystem.getResult(avatar, avatar2);
+ if(result1<50){
+ flag++;
+ }else{
+ deleteFile(f.getId());//鏄竴涓汉鍒犻櫎鍥剧墖 flag=0
+ //濡傛灉鎶撴媿鍥剧墖璺熷徃鏈虹収鐗囧姣旀槸涓�涓汉锛屽垯涓嬮潰鐨勯兘涓嶆墽琛屼簡銆�
+ }
}
}
- if(user1!=null){
+ //濡傛灉鎶撴媿鍥剧墖璺熷徃鏈虹収鐗囧姣斾笉鏄竴涓汉锛屽垯鍐嶅姣斾笅閰嶉�佸憳銆�
+ if(user1!=null&&flag>0){
String avatar = user1.getAvatar();
- int result1 = FaceSystem.getResult(avatar, avatar2);
- if(result1<70){
- flag++;
- }else{
- deleteFile(f.getId());
+ if(StrUtil.isNotEmpty(avatar)){
+ int result1 = FaceSystem.getResult(avatar, avatar2);
+ if(result1<50){
+ flag++;
+ }else{
+ deleteFile(f.getId());
+ }
}
}
- if(flag>0){
+ if(flag>1){
Alarm alarm = new Alarm();
alarm.setCarNo(one.getCarNo());
alarm.setCarId(one.getId());
@@ -128,10 +157,16 @@
alarm.setValue("杞﹀帰寮傚父寮�鍚�");
alarm.setAlarmImg(avatar2);
iAlarmService.saveOrUpdate(alarm);
+
+ EventLog eventLog = new EventLog();
+ eventLog.setCarNo(one.getCarNo());
+ eventLog.setType(5);
+ eventLog.setRefId(avatar2);
+ iEventLogService.saveOrUpdate(eventLog);
}
} catch (Exception e) {
- System.out.println(e.toString());
+ //System.out.println(e.toString());
}
}
}
--
Gitblit v1.9.1