diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java index f4ad2fd..dccb6dc 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java @@ -13,6 +13,7 @@ import lombok.Data; public class GoodsReqQuery { @ApiModelProperty("是否已购买 0否 1是") private Integer isBuy; + private Long faceId; @ApiModelProperty(value = "用户id", hidden = true) private Long memberId; @ApiModelProperty("景区id") diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java index c83e74c..a9a6f79 100644 --- a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java @@ -103,10 +103,10 @@ public class GoodsServiceImpl implements GoodsService { public ApiResponse> sourceGoodsList(GoodsReqQuery query) { Integer sourceType = query.getSourceType(); SourceReqQuery sourceReqQuery = new SourceReqQuery(); - sourceReqQuery.setScenicId(query.getScenicId()); - sourceReqQuery.setIsBuy(query.getIsBuy()); - sourceReqQuery.setMemberId(query.getMemberId()); - sourceReqQuery.setType(sourceType); + sourceReqQuery.setScenicId(query.getScenicId()); + sourceReqQuery.setIsBuy(query.getIsBuy()); + sourceReqQuery.setMemberId(query.getMemberId()); + sourceReqQuery.setType(sourceType); List list = sourceMapper.list(sourceReqQuery); List goodsDetailVOList = new ArrayList<>(); diff --git a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java index 8ba84cf..878c8a9 100644 --- a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java @@ -20,6 +20,7 @@ import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; import com.ycwl.basic.model.pc.source.entity.SourceEntity; import com.ycwl.basic.model.pc.source.resp.SourceRespVO; import com.ycwl.basic.model.pc.task.entity.TaskEntity; +import com.ycwl.basic.model.pc.task.req.TaskReqQuery; import com.ycwl.basic.model.pc.task.resp.TaskRespVO; import com.ycwl.basic.model.pc.template.entity.TemplateEntity; import com.ycwl.basic.model.pc.template.req.TemplateReqQuery; @@ -191,8 +192,12 @@ public class TaskTaskServiceImpl implements TaskService { @Override public void autoCreateTaskByFaceId(Long id) { FaceRespVO faceRespVO = faceMapper.getById(id); - List faceSampleList = faceSampleMapper.listByIds(Arrays.stream(faceRespVO.getMatchSampleIds().split(",")).map(Long::valueOf).collect(Collectors.toList())); - if (faceSampleList.isEmpty()) { + if (StringUtils.isNotBlank(faceRespVO.getMatchSampleIds())) { + List faceSampleList = faceSampleMapper.listByIds(Arrays.stream(faceRespVO.getMatchSampleIds().split(",")).map(Long::valueOf).collect(Collectors.toList())); + if (faceSampleList.isEmpty()) { + return; + } + } else { return; } List templateList = templateMapper.listByScenicId(faceRespVO.getScenicId()); @@ -221,6 +226,15 @@ public class TaskTaskServiceImpl implements TaskService { if (sourceList.isEmpty()) { return; } + if (automatic > 0) { + TaskReqQuery taskReqQuery = new TaskReqQuery(); + taskReqQuery.setFaceId(faceId); + taskReqQuery.setTemplateId(templateId); + List list = taskMapper.list(taskReqQuery); + if (!list.isEmpty()) { + return; + } + } Thread taskThread = new Thread(() -> { List vSourceList = sourceMapper.listVideoBySampleIds(faceSampleList.stream().map(FaceSampleRespVO::getId).collect(Collectors.toList())); List tasks = faceSampleList.stream().map(sample -> { diff --git a/src/main/resources/logback-spring-prod.xml b/src/main/resources/logback-spring-prod.xml index 824c44c..a592ff3 100644 --- a/src/main/resources/logback-spring-prod.xml +++ b/src/main/resources/logback-spring-prod.xml @@ -3,7 +3,7 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} (%-5level) (%-40.40(%logger{40})) : %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%15.15(%thread)] %-40.40(%logger{40}) : %msg%n UTF-8 diff --git a/src/main/resources/mapper/FaceMapper.xml b/src/main/resources/mapper/FaceMapper.xml index 79f449b..b6b447a 100644 --- a/src/main/resources/mapper/FaceMapper.xml +++ b/src/main/resources/mapper/FaceMapper.xml @@ -20,15 +20,9 @@ face_url = #{faceUrl}, - - match_sample_ids = #{matchSampleIds}, - - - first_match_rate = #{firstMatchRate}, - - - match_result = #{matchResult}, - + match_sample_ids = #{matchSampleIds}, + first_match_rate = #{firstMatchRate}, + match_result = #{matchResult}, where id = #{id} diff --git a/src/main/resources/mapper/SourceMapper.xml b/src/main/resources/mapper/SourceMapper.xml index 74e61ab..4e18acc 100644 --- a/src/main/resources/mapper/SourceMapper.xml +++ b/src/main/resources/mapper/SourceMapper.xml @@ -37,6 +37,7 @@ and is_buy = #{isBuy} and so.type = #{type} + and FIND_IN_SET(so.face_sample_id, (select face.match_sample_ids from face where id = #{faceId})) and so.create_time >= #{startTime} and so.create_time <= #{endTime}