diff --git a/src/main/java/com/ycwl/basic/constant/StorageConstant.java b/src/main/java/com/ycwl/basic/constant/StorageConstant.java index 646dfef..8e63be6 100644 --- a/src/main/java/com/ycwl/basic/constant/StorageConstant.java +++ b/src/main/java/com/ycwl/basic/constant/StorageConstant.java @@ -5,4 +5,6 @@ public class StorageConstant { public static final String VIDEO_PIECE_PATH = "source_video"; public static final String PHOTO_PATH = "source_photo"; public static final String PHOTO_WATERMARKED_PATH = "photo_w"; + public static final String VIID_FACE = "viid_face"; + public static final String USER_FACE = "user_face"; } diff --git a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java index 476b714..72356e1 100644 --- a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java +++ b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java @@ -69,6 +69,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static com.ycwl.basic.constant.StorageConstant.PHOTO_PATH; +import static com.ycwl.basic.constant.StorageConstant.VIID_FACE; @IgnoreToken @RestController @@ -304,7 +305,7 @@ public class ViidController { faceSample.setDeviceId(device.getId()); faceSample.setStatus(0); faceSample.setCreateAt(shotTime); - String url = adapter.uploadFile(file, "user-face", UUID.randomUUID() + "." + ext); + String url = adapter.uploadFile(file, VIID_FACE, UUID.randomUUID() + "." + ext); faceSample.setFaceUrl(url); faceSampleMapper.add(faceSample); ThreadPoolExecutor executor = getExecutor(scenicId); @@ -365,7 +366,7 @@ public class ViidController { faceSample.setDeviceId(device.getId()); faceSample.setStatus(0); faceSample.setCreateAt(shotTime); - String url = adapter.uploadFile(file, "user-face", UUID.randomUUID() + "." + ext); + String url = adapter.uploadFile(file, VIID_FACE, UUID.randomUUID() + "." + ext); faceSample.setFaceUrl(url); faceSampleMapper.add(faceSample); DynamicTaskGenerator.addTask(faceSample.getId()); 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 bf915c4..ac46b7f 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 @@ -49,6 +49,7 @@ import java.util.UUID; import java.util.stream.Collectors; import static com.ycwl.basic.constant.FaceConstant.USER_FACE_DB_NAME; +import static com.ycwl.basic.constant.StorageConstant.USER_FACE; /** * @Author:longbinbin @@ -129,7 +130,7 @@ public class FaceServiceImpl implements FaceService { public FaceRecognizeResp faceUpload(MultipartFile file, Long scenicId, Long userId) { //1、上传人脸照片 IStorageAdapter adapter = StorageFactory.use("faces"); - String filePath = StorageUtil.joinPath("user-faces", DateUtil.format(new Date(),"yyyy-MM-dd")); + String filePath = StorageUtil.joinPath(USER_FACE, DateUtil.format(new Date(),"yyyy-MM-dd")); String originalFilename = file.getOriginalFilename(); String suffix = originalFilename.split("\\.", 2)[1]; String fileName = UUID.randomUUID().toString() + "." + suffix;