接货图片和签收图片的完善

wjli

2023-05-25 13c9e4032de40598787a453de77ba0db94666664

 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;
//人脸比对检测车厢异常开启
@@ -84,6 +86,20 @@
                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());

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