diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java index 2ec9b9368..7d0b225de 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java @@ -31,6 +31,16 @@ public interface SysUserFaceMapper extends PjcloudBaseMapper Long selectAllCount(); + /** + * 查询大于当前全部数字人脸编号的下一个编号,作为新样本的虹软搜索标识。 + * + *

编号分配必须覆盖已逻辑删除行,否则删除后重新分配会与在用编号冲突; + * 非数字的历史编号不参与取最大值。

+ * + * @return 下一个可用的人脸编号,无数字编号时为 1 + */ + Long selectNextAutoCode(); + /** * 按用户和虹软样本编号读取审核通过的人脸原图来源,供订单证据服务复制订单专属快照。 * diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java index 7b96e0ca1..13e94ef06 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java @@ -41,7 +41,8 @@ public interface SysUserFaceService extends IService { SysUserFaceTerminalDeleteVo terminalDelete(SysUserFaceTerminalDeleteDto dto); /** - * 校验全部质量样本属于目标部门树后幂等保存结果,图片版本和成功状态优先级均不得倒退。 + * 幂等保存质量结果,图片版本和成功状态优先级均不得倒退;跨部门样本仅出现在 + * 全租户调试终端,质量写入按实测结果落库并记录来源设备。 * * @param dto 可信商户部门、来源设备和质量结果 * @return 已更新、按版本或状态优先级忽略和已不存在的样本编号 diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java index 4bdda30d1..e777f0b58 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java @@ -131,11 +131,11 @@ public class SysUserFaceServiceImpl extends ServiceImpl candidates = baseMapper.terminalQualityCandidates( new ArrayList<>(itemBySampleId.keySet())); - Set allowedDeptIds = new HashSet<>(deptIds); - boolean outOfScope = candidates.stream() - .anyMatch(face -> face.getDeptId() == null || !allowedDeptIds.contains(face.getDeptId())); - if (outOfScope) { - throw new RuntimeException("请求包含不属于当前设备部门范围的人脸"); - } boolean notApproved = candidates.stream() .anyMatch(face -> !TaskCheckStatusEnum.RESULT.getCode().equals(face.getProcessStatus())); if (notApproved) { @@ -480,6 +474,8 @@ public class SysUserFaceServiceImpl extends ServiceImpl updatedSampleIds = new ArrayList<>(); List ignoredStaleSampleIds = new ArrayList<>(); List alreadyAbsentSampleIds = new ArrayList<>(); diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml index 2bfe53c30..1890a5838 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml @@ -87,6 +87,12 @@ select count(0) from sys_user_face + + +