From 03162dec442232983380468a55e203a3baf837d3 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 28 Oct 2025 17:42:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(face):=20=E7=A7=BB=E5=8A=A8=E4=BA=BA?= =?UTF-8?q?=E8=84=B8=E8=AF=86=E5=88=AB=E6=8E=A5=E5=8F=A3=E5=88=B0=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20-=20=E5=B0=86=E4=BA=BA=E8=84=B8=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BB=8EPC?= =?UTF-8?q?=E7=AB=AF=E6=8E=A7=E5=88=B6=E5=99=A8=E8=BF=81=E7=A7=BB=E8=87=B3?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A7=E5=88=B6=E5=99=A8=20-=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=92=8C=E6=A0=B7=E6=9C=ACVO=E7=B1=BB=E7=9A=84?= =?UTF-8?q?=E5=8C=85=E8=B7=AF=E5=BE=84=E8=87=B3mobile.face=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=20-=20=E5=88=A0=E9=99=A4PC=E7=AB=AF=E5=86=97=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E6=8E=A5=E5=8F=A3=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=20-=20=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1=E5=B1=82?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BC=95=E7=94=A8=E8=87=B3=E6=96=B0=E7=9A=84?= =?UTF-8?q?mobile.face=E5=8C=85=E8=B7=AF=E5=BE=84=20-=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=BF=87=E6=97=B6=E7=9A=84FaceSampleRespVO=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mobile/AppFaceController.java | 17 ++++++++++++++++- .../basic/controller/pc/FaceController.java | 15 --------------- .../face}/FaceRecognitionDetailVO.java | 2 +- .../face}/FaceRecognitionSampleVO.java | 2 +- .../face}/FaceRecognitionUpdateReq.java | 4 ++-- .../com/ycwl/basic/service/pc/FaceService.java | 5 ++--- .../basic/service/pc/impl/FaceServiceImpl.java | 6 +++--- 7 files changed, 25 insertions(+), 26 deletions(-) rename src/main/java/com/ycwl/basic/model/{pc/face/resp => mobile/face}/FaceRecognitionDetailVO.java (94%) rename src/main/java/com/ycwl/basic/model/{pc/face/resp => mobile/face}/FaceRecognitionSampleVO.java (95%) rename src/main/java/com/ycwl/basic/model/{pc/face/req => mobile/face}/FaceRecognitionUpdateReq.java (87%) diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java index 37dbf937..ae188d07 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java @@ -4,9 +4,10 @@ import com.ycwl.basic.model.jwt.JwtInfo; import com.ycwl.basic.model.mobile.face.FaceRecognizeResp; import com.ycwl.basic.model.mobile.face.FaceStatusResp; import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; +import com.ycwl.basic.model.mobile.face.FaceRecognitionUpdateReq; +import com.ycwl.basic.model.mobile.face.FaceRecognitionDetailVO; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; -import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.service.pc.FaceService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; @@ -108,4 +109,18 @@ public class AppFaceController { faceService.matchCustomFaceId(faceId, faceIds); return ApiResponse.success("OK"); } + + @PutMapping("/{faceId}/recognition") + public ApiResponse updateRecognition(@PathVariable Long faceId, + @RequestBody FaceRecognitionUpdateReq req) { + req.setFaceId(faceId); + return ApiResponse.success(faceService.updateRecognition(req)); + } + + @GetMapping("/{faceId}/recognition/detail") + public ApiResponse recognitionDetail(@PathVariable Long faceId) { + return ApiResponse.success(faceService.getRecognitionDetail(faceId)); + } + + } diff --git a/src/main/java/com/ycwl/basic/controller/pc/FaceController.java b/src/main/java/com/ycwl/basic/controller/pc/FaceController.java index 58865387..ec105420 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/FaceController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/FaceController.java @@ -3,8 +3,6 @@ package com.ycwl.basic.controller.pc; import com.github.pagehelper.PageInfo; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.face.req.FaceReqQuery; -import com.ycwl.basic.model.pc.face.req.FaceRecognitionUpdateReq; -import com.ycwl.basic.model.pc.face.resp.FaceRecognitionDetailVO; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.service.pc.FaceService; import com.ycwl.basic.utils.ApiResponse; @@ -55,17 +53,4 @@ public class FaceController { return faceService.deleteByIds(ids); } - @PutMapping("/{faceId}/recognition") - public ApiResponse updateRecognition(@PathVariable Long faceId, - @RequestBody FaceRecognitionUpdateReq req) { - req.setFaceId(faceId); - return ApiResponse.success(faceService.updateRecognition(req)); - } - - @GetMapping("/{faceId}/recognition/detail") - public ApiResponse recognitionDetail(@PathVariable Long faceId) { - return ApiResponse.success(faceService.getRecognitionDetail(faceId)); - } - - } diff --git a/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRecognitionDetailVO.java b/src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionDetailVO.java similarity index 94% rename from src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRecognitionDetailVO.java rename to src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionDetailVO.java index 74816955..39450e0f 100644 --- a/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRecognitionDetailVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionDetailVO.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.model.pc.face.resp; +package com.ycwl.basic.model.mobile.face; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRecognitionSampleVO.java b/src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionSampleVO.java similarity index 95% rename from src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRecognitionSampleVO.java rename to src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionSampleVO.java index 5754ed0e..6bf5d62f 100644 --- a/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRecognitionSampleVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionSampleVO.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.model.pc.face.resp; +package com.ycwl.basic.model.mobile.face; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.pc.face.enums.FaceRecognitionFilterReason; diff --git a/src/main/java/com/ycwl/basic/model/pc/face/req/FaceRecognitionUpdateReq.java b/src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionUpdateReq.java similarity index 87% rename from src/main/java/com/ycwl/basic/model/pc/face/req/FaceRecognitionUpdateReq.java rename to src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionUpdateReq.java index d1bb8bde..86f362ac 100644 --- a/src/main/java/com/ycwl/basic/model/pc/face/req/FaceRecognitionUpdateReq.java +++ b/src/main/java/com/ycwl/basic/model/mobile/face/FaceRecognitionUpdateReq.java @@ -1,4 +1,4 @@ -package com.ycwl.basic.model.pc.face.req; +package com.ycwl.basic.model.mobile.face; import lombok.Data; @@ -27,7 +27,7 @@ public class FaceRecognitionUpdateReq { /** * 是否强制重新走一次识别流程。 */ - private Boolean forceRematch; + private Boolean forceRematch = false; /** * 前端传回的备注信息。 diff --git a/src/main/java/com/ycwl/basic/service/pc/FaceService.java b/src/main/java/com/ycwl/basic/service/pc/FaceService.java index 14d82bd0..381b6d4e 100644 --- a/src/main/java/com/ycwl/basic/service/pc/FaceService.java +++ b/src/main/java/com/ycwl/basic/service/pc/FaceService.java @@ -5,12 +5,11 @@ import com.ycwl.basic.model.mobile.face.FaceRecognizeResp; import com.ycwl.basic.model.mobile.face.FaceStatusResp; import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; import com.ycwl.basic.model.pc.face.entity.FaceEntity; -import com.ycwl.basic.model.pc.face.req.FaceRecognitionUpdateReq; +import com.ycwl.basic.model.mobile.face.FaceRecognitionUpdateReq; import com.ycwl.basic.model.pc.face.req.FaceReqQuery; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; -import com.ycwl.basic.model.pc.face.resp.FaceRecognitionDetailVO; +import com.ycwl.basic.model.mobile.face.FaceRecognitionDetailVO; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; -import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.model.task.resp.SearchFaceRespVo; import com.ycwl.basic.utils.ApiResponse; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java index 07c2f2e3..283153c1 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java @@ -28,10 +28,10 @@ import com.ycwl.basic.model.mobile.statistic.req.StatisticsRecordAddReq; import com.ycwl.basic.model.pc.device.entity.DeviceEntity; import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.face.enums.FaceRecognitionFilterReason; -import com.ycwl.basic.model.pc.face.req.FaceRecognitionUpdateReq; +import com.ycwl.basic.model.mobile.face.FaceRecognitionUpdateReq; import com.ycwl.basic.model.pc.face.req.FaceReqQuery; -import com.ycwl.basic.model.pc.face.resp.FaceRecognitionDetailVO; -import com.ycwl.basic.model.pc.face.resp.FaceRecognitionSampleVO; +import com.ycwl.basic.model.mobile.face.FaceRecognitionDetailVO; +import com.ycwl.basic.model.mobile.face.FaceRecognitionSampleVO; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; import com.ycwl.basic.model.pc.mp.MpConfigEntity;