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 d473c86..c3fa914 100644 --- a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java +++ b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java @@ -69,7 +69,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static com.ycwl.basic.constant.StorageConstant.PHOTO_PATH; -import static com.ycwl.basic.service.task.impl.TaskFaceServiceImpl.generateEntityId; @IgnoreToken @RestController @@ -312,7 +311,7 @@ public class ViidController { executor.execute(() -> { if (faceBodyAdapter != null) { taskFaceService.assureFaceDb(faceBodyAdapter, scenicId.toString()); - AddFaceResp addFaceResp = faceBodyAdapter.addFace(scenicId.toString(), generateEntityId(faceSample), url, newFaceSampleId.toString()); + AddFaceResp addFaceResp = faceBodyAdapter.addFace(scenicId.toString(), faceSample.getId().toString(), url, newFaceSampleId.toString()); if (addFaceResp != null) { faceSample.setScore(addFaceResp.getScore()); faceSampleMapper.update(faceSample); @@ -374,7 +373,7 @@ public class ViidController { executor.execute(() -> { if (faceBodyAdapter != null) { taskFaceService.assureFaceDb(faceBodyAdapter, scenicId.toString()); - AddFaceResp addFaceResp = faceBodyAdapter.addFace(scenicId.toString(), generateEntityId(faceSample), url, newFaceSampleId.toString()); + AddFaceResp addFaceResp = faceBodyAdapter.addFace(scenicId.toString(), faceSample.getId().toString(), url, newFaceSampleId.toString()); if (addFaceResp != null) { faceSample.setScore(addFaceResp.getScore()); faceSampleMapper.update(faceSample); diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java index e160b44..83a398a 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java @@ -3,8 +3,6 @@ package com.ycwl.basic.service.task.impl; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.facebody.model.v20191230.ListFaceEntitiesRequest; -import com.aliyuncs.facebody.model.v20191230.ListFaceEntitiesResponse; import com.aliyuncs.facebody.model.v20191230.SearchFaceRequest; import com.ycwl.basic.biz.OrderBiz; import com.ycwl.basic.constant.FaceConstant; @@ -17,7 +15,6 @@ import com.ycwl.basic.facebody.entity.SearchFaceResultItem; import com.ycwl.basic.mapper.FaceDetectLogMapper; import com.ycwl.basic.mapper.FaceMapper; import com.ycwl.basic.mapper.FaceSampleMapper; -import com.ycwl.basic.mapper.ScenicMapper; import com.ycwl.basic.mapper.SourceMapper; import com.ycwl.basic.model.mobile.order.IsBuyRespVO; import com.ycwl.basic.model.pc.device.entity.DeviceConfigEntity; @@ -27,7 +24,6 @@ import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.model.pc.faceDetectLog.entity.FaceDetectLog; import com.ycwl.basic.model.pc.faceDetectLog.resp.MatchLocalRecord; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; -import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; import com.ycwl.basic.model.pc.source.entity.MemberSourceEntity; import com.ycwl.basic.model.pc.source.entity.SourceEntity; @@ -42,8 +38,6 @@ import com.ycwl.basic.storage.adapters.IStorageAdapter; import com.ycwl.basic.storage.utils.StorageUtil; import com.ycwl.basic.task.VideoPieceGetter; import com.ycwl.basic.utils.DateUtils; -import com.ycwl.basic.utils.ratelimiter.FixedRateLimiter; -import com.ycwl.basic.utils.ratelimiter.IRateLimiter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -55,18 +49,13 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Random; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; import static com.ycwl.basic.constant.FaceConstant.USER_FACE_DB_NAME; @@ -370,17 +359,6 @@ public class TaskFaceServiceImpl implements TaskFaceService { return redisTemplate.delete(FaceConstant.FACE_DB_NAME_PFX + "*"); } - - private static final String DATE_FORMAT="yyyyMMddHHmmss"; - private static final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);; - - public static String generateEntityId(FaceSampleEntity entity) { - return entity.getId().toString() + "_" + sdf.format(entity.getCreateAt()); - } - public static String generateEntityId(FaceSampleRespVO entity) { - return entity.getId().toString() + "_" + sdf.format(entity.getCreateAt()); - } - public String getFaceUrl(Long faceId) { if (faceId == null) { return null; diff --git a/src/main/java/com/ycwl/basic/task/FaceCleaner.java b/src/main/java/com/ycwl/basic/task/FaceCleaner.java index fc92a00..9d1bf97 100644 --- a/src/main/java/com/ycwl/basic/task/FaceCleaner.java +++ b/src/main/java/com/ycwl/basic/task/FaceCleaner.java @@ -37,7 +37,6 @@ import java.util.List; import java.util.Objects; import static com.ycwl.basic.constant.FaceConstant.USER_FACE_DB_NAME; -import static com.ycwl.basic.service.task.impl.TaskFaceServiceImpl.generateEntityId; @Component @EnableScheduling @@ -79,7 +78,7 @@ public class FaceCleaner { return; } faceSampleList.forEach(faceSample -> { - boolean success = adapter.deleteFace(String.valueOf(scenic.getId()), generateEntityId(faceSample)); + boolean success = adapter.deleteFace(String.valueOf(scenic.getId()), faceSample.getId().toString()); if (success) { log.info("当前景区{}，人脸样本ID{}，删除成功", scenic.getId(), faceSample.getId()); faceSampleMapper.deleteById(faceSample.getId());