diff --git a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java index b4eb7193..c898261a 100644 --- a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java +++ b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java @@ -58,10 +58,6 @@ public class LyCompatibleController { @Autowired private VideoRepository videoRepository; @Autowired - private VideoMapper videoMapper; - @Autowired - private TaskTaskServiceImpl taskTaskServiceImpl; - @Autowired private RedisTemplate redisTemplate; @Autowired private VideoTaskRepository videoTaskRepository; @@ -217,7 +213,7 @@ public class LyCompatibleController { map.put("face_id", String.valueOf(videoRespVO.getFaceId())); } map.put("template_cover_image", contentPageVO.getTemplateCoverUrl()); - Date taskShotDate = taskTaskServiceImpl.getTaskShotDate(videoRespVO.getTaskId()); + Date taskShotDate = videoTaskRepository.getTaskShotDate(videoRespVO.getTaskId()); map.put("shoottime", DateUtil.format(taskShotDate, "yyyy-MM-dd HH:mm")); map.put("openid", openId); map.put("scenicname", contentPageVO.getScenicName()); diff --git a/src/main/java/com/ycwl/basic/repository/VideoTaskRepository.java b/src/main/java/com/ycwl/basic/repository/VideoTaskRepository.java index dd2af249..c7d4e0f5 100644 --- a/src/main/java/com/ycwl/basic/repository/VideoTaskRepository.java +++ b/src/main/java/com/ycwl/basic/repository/VideoTaskRepository.java @@ -53,29 +53,6 @@ public class VideoTaskRepository { redisTemplate.delete(String.format(TASK_CACHE_KEY, taskId)); } - - public Date getTaskShotDate(Long taskId) { - TaskRespVO taskRespVO = taskMapper.getById(taskId); - if (taskRespVO == null) { - return null; - } - Date shotTime = taskRespVO.getCreateTime(); - JacksonUtil.JSONObjectCompat paramJson = JacksonUtil.JSONObjectCompat.parseObject(taskRespVO.getTaskParams()); - if (paramJson != null) { - Optional any = paramJson.keySet().stream().filter(StringUtils::isNumeric).findAny(); - if (any.isPresent()) { - var jsonArray = paramJson.getJSONArray(any.get()); - if (jsonArray != null && !jsonArray.isEmpty()) { - JacksonUtil.JSONObjectCompat jsonObject = jsonArray.get(0); - if (jsonObject.getString("createTime") != null) { - shotTime = DateUtil.parse(jsonObject.getString("createTime")); - } - } - } - } - return shotTime; - } - public Integer getTaskDeviceNum(Long taskId) { TaskEntity task = getTaskById(taskId); if (task == null) { @@ -131,6 +108,32 @@ public class VideoTaskRepository { return deviceCount.get(); } + public Date getTaskShotDate(Long taskId) { + TaskEntity task = getTaskById(taskId); + if (task == null) { + return null; + } + Date shotTime = task.getCreateTime(); + Map paramJson = JacksonUtil.parseObject(task.getTaskParams(), Map.class); + if (paramJson != null) { + Optional any = paramJson.keySet().stream().filter(StringUtils::isNumeric).findAny(); + if (any.isPresent()) { + @SuppressWarnings("unchecked") + List> jsonArray = (List>) paramJson.get(any.get()); + if (jsonArray != null && !jsonArray.isEmpty()) { + Map jsonObject = jsonArray.get(0); + if (jsonObject.containsKey("createTime")) { + Object createTimeObj = jsonObject.get("createTime"); + if (createTimeObj instanceof Number) { + shotTime = new Date(((Number) createTimeObj).longValue()); + } + } + } + } + } + return shotTime; + } + /** * 检查任务是否可以更新 * @param taskId 任务ID diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java index 9bd4f10b..d4e35aaf 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java @@ -46,7 +46,6 @@ import com.ycwl.basic.service.mobile.GoodsService; import com.ycwl.basic.repository.TemplateRepository; import com.ycwl.basic.config.VideoUpdateConfig; import com.ycwl.basic.model.repository.TaskUpdateResult; -import com.ycwl.basic.service.task.TaskService; import com.ycwl.basic.storage.StorageFactory; import com.ycwl.basic.storage.adapters.IStorageAdapter; import com.ycwl.basic.storage.enums.StorageAcl; @@ -88,8 +87,6 @@ public class GoodsServiceImpl implements GoodsService { @Autowired private VideoTaskRepository videoTaskRepository; @Autowired - private TaskService taskTaskService; - @Autowired private ScenicRepository scenicRepository; @Autowired private OrderBiz orderBiz; @@ -244,7 +241,7 @@ public class GoodsServiceImpl implements GoodsService { goodsDetailVO.setIsBuy(1); } } - goodsDetailVO.setShotTime(taskTaskService.getTaskShotDate(video.getTaskId())); + goodsDetailVO.setShotTime(videoTaskRepository.getTaskShotDate(video.getTaskId())); goodsDetailVO.setLensNum(videoTaskRepository.getTaskLensNum(video.getTaskId())); goodsDetailVO.setDevicesNum(videoTaskRepository.getTaskDeviceNum(video.getTaskId())); CouponRecordQueryResp couponRecord = couponBiz.queryUserCouponRecord(video.getScenicId(), userId, video.getFaceId(), video.getTemplateId().toString()); diff --git a/src/main/java/com/ycwl/basic/service/task/TaskService.java b/src/main/java/com/ycwl/basic/service/task/TaskService.java index 813bde29..5b087b9b 100644 --- a/src/main/java/com/ycwl/basic/service/task/TaskService.java +++ b/src/main/java/com/ycwl/basic/service/task/TaskService.java @@ -7,8 +7,6 @@ import com.ycwl.basic.model.task.req.TaskSuccessReqVo; import com.ycwl.basic.model.task.req.WorkerAuthReqVo; import com.ycwl.basic.model.task.resp.TaskSyncRespVo; -import java.util.Date; - public interface TaskService { TaskSyncRespVo handleSyncTask(TaskReqVo req); @@ -28,8 +26,6 @@ public interface TaskService { void autoCreateTaskByFaceId(Long faceId); - Date getTaskShotDate(Long taskId); - void sendVideoGeneratedServiceNotification(Long taskId, Long memberId); TaskRespVO taskInfo(Long taskId); diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java index 060d558a..6c97450b 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java @@ -591,33 +591,6 @@ public class TaskTaskServiceImpl implements TaskService { memberVideo.forEach(item -> sendVideoGeneratedServiceNotification(taskId, item.getMemberId())); } - @Override - public Date getTaskShotDate(Long taskId) { - TaskRespVO taskRespVO = taskMapper.getById(taskId); - if (taskRespVO == null) { - return null; - } - Date shotTime = taskRespVO.getCreateTime(); - Map paramJson = JacksonUtil.parseObject(taskRespVO.getTaskParams(), Map.class); - if (paramJson != null) { - Optional any = paramJson.keySet().stream().filter(StringUtils::isNumeric).findAny(); - if (any.isPresent()) { - @SuppressWarnings("unchecked") - List> jsonArray = (List>) paramJson.get(any.get()); - if (jsonArray != null && !jsonArray.isEmpty()) { - Map jsonObject = jsonArray.get(0); - if (jsonObject.containsKey("createTime")) { - Object createTimeObj = jsonObject.get("createTime"); - if (createTimeObj instanceof Number) { - shotTime = new Date(((Number) createTimeObj).longValue()); - } - } - } - } - } - return shotTime; - } - @Override public void sendVideoGeneratedServiceNotification(Long taskId, Long memberId) { MemberVideoEntity item = videoMapper.queryRelationByMemberTask(memberId, taskId);