From 25681806c3d2341178ed8ab72feea6382325bb5a Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 17 Dec 2025 22:08:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(printer):=20=E6=94=AF=E6=8C=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=90=8C=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E5=83=8F=E7=B4=A0=E6=9D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为getSourceByFaceSampleId接口添加type参数,默认值为2 - 修改sourceMapper调用,传入动态type参数 - 移除未使用的scenicService和faceService依赖 - 引入Map类但尚未使用,可能为后续功能预留 --- .../ycwl/basic/controller/printer/PrinterTvController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ycwl/basic/controller/printer/PrinterTvController.java b/src/main/java/com/ycwl/basic/controller/printer/PrinterTvController.java index fd70ae44..ed1c3346 100644 --- a/src/main/java/com/ycwl/basic/controller/printer/PrinterTvController.java +++ b/src/main/java/com/ycwl/basic/controller/printer/PrinterTvController.java @@ -48,6 +48,7 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.UUID; import static com.ycwl.basic.constant.StorageConstant.USER_FACE; @@ -62,9 +63,7 @@ public class PrinterTvController { private final DeviceRepository deviceRepository; private final ScenicRepository scenicRepository; private final FaceRepository faceRepository; - private final TaskFaceService faceService; private final FaceService pcFaceService; - private final ScenicService scenicService; private final SourceMapper sourceMapper; private final FaceMapper faceMapper; private final MemberRelationRepository memberRelationRepository; @@ -195,8 +194,8 @@ public class PrinterTvController { * @return type=2且face_sample_id匹配的source记录 */ @GetMapping("/{faceSampleId}/source") - public ApiResponse getSourceByFaceSampleId(@PathVariable Long faceSampleId) { - SourceEntity source = sourceMapper.getBySampleIdAndType(faceSampleId, 2); + public ApiResponse getSourceByFaceSampleId(@PathVariable Long faceSampleId, @RequestParam(name = "type", required = false, defaultValue = "2") Integer type) { + SourceEntity source = sourceMapper.getBySampleIdAndType(faceSampleId, type); if (source == null) { return ApiResponse.fail("未找到对应的图像素材"); }