From d82b5446de9c22e1afde0f0a57f07cf63d893eb9 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 14 Mar 2024 19:16:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/async/AsyncWorker.java           | 1 +
 .../java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java | 5 +++++
 .../worker/service/impl/WorkerAttendanceServiceImpl.java     | 2 ++
 src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java  | 1 +
 4 files changed, 9 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java b/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java
index 254b752a4..6a95fe496 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncWorker.java
@@ -72,6 +72,7 @@ public class AsyncWorker {
             if (list.size() > 0) {
                 for (WorkerInfo info : list) {
                     try {
+                        info.setNoticeUserId(userId);
                         projectUfaceConfigService.sendBatchWorkerInfo(info, projectUfaceConfig, devList);
                     } catch (Exception e) {
                         log.error("下发人员异常，人员名称：{}", info.getWorkerName());
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
index 4ee4b29b7..a2cf99812 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java
@@ -385,6 +385,11 @@ public class WorkerInfo implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "证书类型名称")
     private String certificateTypeName;
+    @TableField(exist = false)
+    /**
+     * 通知的人员id
+     */
+    private Long noticeUserId;
 
     public String toExistString() {
         return "WorkerInfo{" +
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 21ec6adbe..fa4803655 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
@@ -821,6 +821,8 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
                     workerAttendance.setImageUrl(MapUtils.getString(map, "faceUrl"));
                     workerAttendance.setAttendanceType(1);
                     workerAttendanceMapper.insert(workerAttendance);
+                    //计算在场
+                    workerAttendancePresenceService.addWorkerAttendancePresence(workerAttendance);
                     asyncSendAttendance.saveAndSendAttendance(workerAttendance, info);
 
                     resultMap.put("msg", "操作成功");
diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
index 29c158d86..3c881a090 100644
--- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
+++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
@@ -327,6 +327,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/xmgl/workerBlacklist/list").permitAll()
                     .antMatchers("/xmgl/carPassRecord/addCarPassRecord").permitAll()
                     .antMatchers("/xmgl/notice/add").permitAll()
+                    .antMatchers("/xmgl/upload/uploadBase64").permitAll()
                     .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
                     .anyRequest().authenticated()       // 剩下所有的验证都需要验证.
                     .and()