From 9531b644c20d32641c7e99e2aca51de6f5557ef3 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 29 Apr 2024 14:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=BC=93=E8=80=83=E5=8B=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WorkerAttendanceServiceImpl.java     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

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 2ab220784..b0c06e6ab 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
@@ -67,6 +67,8 @@ import static com.zhgd.xmgl.config.FaceRunner.faceEngine;
 @Slf4j
 @Transactional(rollbackFor = Exception.class)
 public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMapper, WorkerAttendance> implements IWorkerAttendanceService {
+    @Autowired
+    WorkerAttendanceServiceImpl workerAttendanceService;
     @Autowired
     private UploadFileService uploadFileService;
     @Autowired
@@ -196,7 +198,6 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
         }
     }
 
-
     @Override
     public IPage<EntityMap> selectWorkerAttendancePage(Map<String, Object> map) {
         int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
@@ -290,7 +291,6 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
         return type;
     }
 
-
     @Override
     public void exportExcelWorkerAttendance(HttpServletResponse response, Map<String, Object> map) {
         try {
@@ -497,7 +497,6 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
         workerMonthAttendanceStatisticsService.remove(statisticsQueryWrapper);
     }
 
-
     @Override
     public void ufaceNewJXJCallbackUrl(Map<String, Object> map) {
         try {
@@ -1085,7 +1084,6 @@ status	状态码	String	1表示成功；其余表示失败
 
     @Override
     public String uploadAttendanceByDev(UploadAttendanceByDevDto dto) {
-
         WorkerInfo workerInfo = workerInfoMapper.selectById(dto.getWorkerId());
         if (workerInfo == null) {
             throw new OpenAlertException("workerId不存在");
@@ -1095,22 +1093,20 @@ status	状态码	String	1表示成功；其余表示失败
         if (dev == null) {
             throw new OpenAlertException("deviceId不存在");
         }
-        WorkerAttendance attendance = new WorkerAttendance();
-        attendance.setPersonSn(workerInfo.getPersonSn());
-        attendance.setPassType(getPassType(dto.getDirection()));
-        attendance.setCreateTime(DateUtil.formatDateTime(new Date(Long.valueOf(dto.getTime()))));
-        attendance.setProjectSn(workerInfo.getProjectSn());
-        attendance.setCardType(getCardType(dto.getType()));
+        HashMap<String, Object> map = new HashMap<>();
         FileInfo fileInfo = null;
         if (StringUtils.isNotBlank(dto.getBase64())) {
             fileInfo = uploadFileService.uploadFileBase64Image(dto.getBase64());
-            attendance.setImageUrl(fileInfo.getUrl());
+            map.put("faceUrl", fileInfo.getUrl());
         }
-        attendance.setPassagewayName(dev.getDevName());
-        attendance.setAttendanceStatus(1);
-        attendance.setTemperature(dto.getTemp());
-        attendance.setDevSn(dev.getDevSn());
-        baseMapper.insert(attendance);
+        map.put("passTime", DateUtil.formatDateTime(new Date(Long.valueOf(dto.getTime()))));
+        map.put("idCard", workerInfo.getIdCard());
+        map.put("attendanceNumber", workerInfo.getAttendanceNumber());
+        map.put("direction", getPassType(dto.getDirection()));
+        map.put("passType", 2);
+        map.put("projectCode", workerInfo.getProjectSn());
+        map.put("devCode", dev.getDevSn());
+        workerAttendanceService.saveExternalPassRecord(map);
 
         GetWorkerInfoByDevVo vo = new GetWorkerInfoByDevVo();
         vo.setSuccess(true);