From 5b739a8bfe3ae2a304049071baa3867f821ba072 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 9 Sep 2024 16:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=BC=93=E7=9A=84=E6=9C=A8=E5=9E=92?=
 =?UTF-8?q?=E7=9A=84=E8=80=83=E5=8B=A4=E8=BD=AC=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/UploadAttendanceByDevDto.java   |  6 ++++
 .../impl/WorkerAttendanceServiceImpl.java     | 33 ++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/UploadAttendanceByDevDto.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/UploadAttendanceByDevDto.java
index 45b087cda..67f260e72 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/UploadAttendanceByDevDto.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/UploadAttendanceByDevDto.java
@@ -66,4 +66,10 @@ public class UploadAttendanceByDevDto {
     @ApiModelProperty("经度")
     private String pos_lng;
 
+    private String idCard;
+    /**
+     * 是否被转发
+     */
+    private Boolean isTranspond;
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
index ebb3464c2..19ceb0931 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
@@ -5,6 +5,8 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
 import cn.xuyanwu.spring.file.storage.FileInfo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -56,6 +58,7 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
@@ -315,7 +318,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
         int hour = Integer.valueOf(time.substring(11, 13));
         if (dev != null && dev.getIsEnter() != null && dev.getIsEnter() == 1 && dev.getIsOut() != null && dev.getIsOut() == 1) {
             String entTime = "," + dev.getEnterTime() + ",";
-            if (entTime.indexOf(Cts.COMMA + hour +Cts.COMMA) > -1) {
+            if (entTime.indexOf(Cts.COMMA + hour + Cts.COMMA) > -1) {
                 type = 1;
             } else {
                 type = 2;
@@ -1177,15 +1180,35 @@ status	状态码	String	1表示成功；其余表示失败
 
     @Override
     public String uploadAttendanceByDev(UploadAttendanceByDevDto dto) {
-        WorkerInfo workerInfo = workerInfoMapper.selectById(dto.getWorkerId());
-        if (workerInfo == null) {
-            throw new OpenAlertException("workerId不存在");
-        }
         UfaceDev dev = ufaceDevMapper.selectOne(new LambdaQueryWrapper<UfaceDev>()
                 .eq(UfaceDev::getDevSn, dto.getDeviceId()));
         if (dev == null) {
             throw new OpenAlertException("deviceId不存在");
         }
+        WorkerInfo workerInfo;
+        if (StrUtil.isNotBlank(dto.getIdCard())) {
+            workerInfo = workerInfoMapper.selectOne(new LambdaQueryWrapper<WorkerInfo>().eq(WorkerInfo::getIdCard, dto.getIdCard()).eq(WorkerInfo::getProjectSn, dev.getProjectSn()));
+        } else {
+            workerInfo = workerInfoMapper.selectById(dto.getWorkerId());
+        }
+        if (workerInfo == null) {
+            throw new OpenAlertException("workerId不存在");
+        }
+        dto.setIdCard(workerInfo.getIdCard());
+        if (!Objects.equals(dto.getIsTranspond(), true)) {
+            dto.setWorkerId(null);
+            dto.setIsTranspond(true);
+            if (Objects.equals(dev.getProjectSn(), "F20D19C31C5140C585185BAB10E8D9A2")) {
+                CompletableFuture.runAsync(() -> {
+                    //木垒转发
+                    String result2 = HttpRequest.post("http://222.80.185.228:6090/photo")
+                            .body(JSON.toJSONString(dto))
+                            .timeout(2000)//超时，毫秒
+                            .execute().body();
+                    log.info("木垒转发考勤结果：{}", result2);
+                });
+            }
+        }
         HashMap<String, Object> map = new HashMap<>(16);
         FileInfo fileInfo = null;
         if (StringUtils.isNotBlank(dto.getBase64())) {