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> sendBatchWokerDev(@RequestBody Map 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 i public void sendBatchWokerDev(Map map) { QueryWrapper 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 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 list = ufaceDevMapper.selectList(qw); if (list == null || list.size() == 0) { throw new OpenAlertException("请先添加设备");