From 6eb8ccdd72d3e11e6fa57622fdf95692320976c7 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 25 Aug 2025 11:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=92=E6=B5=B7=E4=B8=AD=E6=B0=B4=E5=8C=97?=
 =?UTF-8?q?=E6=96=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/worker/controller/UfaceDevController.java    | 1 +
 .../xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java
index e9ecb3fa1..05fd71695 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java
@@ -113,6 +113,7 @@ public class UfaceDevController {
              @ApiImplicitParam(name = "personType", value = "人员类型  1、劳务人员   2、管理人员", paramType = "body", required = false, dataType = "String"),
              @ApiImplicitParam(name = "userId", value = "通知的人员ID", paramType = "body", required = true, dataType = "String"),
              @ApiImplicitParam(name = "workerIds", value = "下发的劳务人员IDs（多个逗号分割）", paramType = "body", required = false, dataType = "String"),
+             @ApiImplicitParam(name = "ufaceDevId", value = "门禁设备id（多个,分割）", paramType = "body", required = true, dataType = "String"),
      })
      @PostMapping(value = "/sendBatchWokerDev")
      public Result< Map<String, Object>> sendBatchWokerDev(@RequestBody Map<String, Object> map) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java
index 0f3a02c8f..a97f40aa0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java
@@ -205,11 +205,15 @@ public class UfaceDevServiceImpl extends ServiceImpl<UfaceDevMapper, UfaceDev> i
     public void sendBatchWokerDev(Map<String, Object> map) {
         QueryWrapper<ProjectUfaceConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(ProjectUfaceConfig::getProjectSn, MapUtils.getString(map, "projectSn"));
+        String ufaceDevId = MapUtils.getString(map, "ufaceDevId");
         ProjectUfaceConfig ufaceConfig = projectUfaceConfigService.getOne(queryWrapper);
         ThreadLocalUtil.addInKey("now", new Date());
         if (ufaceConfig != null && ufaceConfig.getIssueDev() == 1) {
             QueryWrapper<UfaceDev> qw = new QueryWrapper<>();
             qw.lambda().eq(UfaceDev::getProjectSn, MapUtils.getString(map, "projectSn"));
+            if (StringUtils.isNotBlank(ufaceDevId)) {
+                qw.lambda().in(UfaceDev::getDeviceId, Arrays.asList(ufaceDevId.split(",")));
+            }
             List<UfaceDev> list = ufaceDevMapper.selectList(qw);
             if (list == null || list.size() == 0) {
                 throw new OpenAlertException("请先添加设备");