From 81af4cff627b7ec1e125b90f4fd57392c6d70588 Mon Sep 17 00:00:00 2001
From: wjli <591616088@qq.com>
Date: 星期三, 10 四月 2024 11:28:03 +0800
Subject: [PATCH] 修改签收出错bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/face/FaceImgController.java | 70 +++++++++++++++++++++++++++--------
1 files changed, 54 insertions(+), 16 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..be1df9b 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,15 +13,20 @@
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;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -35,10 +40,12 @@
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
+@Api(tags = "浜鸿劯姣斿妫�娴嬭溅鍘㈠紓甯稿紑鍚�")
@RequestMapping("/hk")
public class FaceImgController {
@@ -56,8 +63,10 @@
private IAlarmService iAlarmService;
@Autowired
private RedisTemplateHelper redisTemplate;
+ @Autowired
+ private IEventLogService iEventLogService;
-
+ @ApiOperation(value = "浜鸿劯瀵规瘮鍥剧墖")
@RequestMapping(value = "/faceImg", method = RequestMethod.POST)
public void saveOrUpdate(HttpServletRequest request) throws IOException, ServletException {
OssSetting os = new Gson().fromJson(settingService.get(SettingConstant.LOCAL_OSS).getValue(), OssSetting.class);
@@ -71,11 +80,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 +126,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 +160,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