部分修改
This commit is contained in:
parent
d527a8fdce
commit
d308ef9bca
@ -1,5 +1,6 @@
|
|||||||
package com.ycwl.basic.controller.mobile;
|
package com.ycwl.basic.controller.mobile;
|
||||||
|
|
||||||
|
import com.ycwl.basic.constant.BaseContextHandler;
|
||||||
import com.ycwl.basic.model.jwt.JwtInfo;
|
import com.ycwl.basic.model.jwt.JwtInfo;
|
||||||
import com.ycwl.basic.model.mobile.goods.*;
|
import com.ycwl.basic.model.mobile.goods.*;
|
||||||
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
|
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
|
||||||
@ -39,6 +40,7 @@ public class AppGoodsController {
|
|||||||
@ApiOperation("源素材(原片/照片)商品列表")
|
@ApiOperation("源素材(原片/照片)商品列表")
|
||||||
@PostMapping("/sourceGoodsList")
|
@PostMapping("/sourceGoodsList")
|
||||||
public ApiResponse<List<GoodsDetailVO>> sourceGoodsList(@RequestBody GoodsReqQuery query) {
|
public ApiResponse<List<GoodsDetailVO>> sourceGoodsList(@RequestBody GoodsReqQuery query) {
|
||||||
|
query.setMemberId(Long.valueOf(BaseContextHandler.getUserId()));
|
||||||
return goodsService.sourceGoodsList(query);
|
return goodsService.sourceGoodsList(query);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,6 +230,7 @@ public class TaskTaskServiceImpl implements TaskService {
|
|||||||
}
|
}
|
||||||
VideoPieceGetter.Task task = new VideoPieceGetter.Task();
|
VideoPieceGetter.Task task = new VideoPieceGetter.Task();
|
||||||
task.setFaceSampleId(sample.getId());
|
task.setFaceSampleId(sample.getId());
|
||||||
|
task.setMemberId(faceRespVO.getMemberId());
|
||||||
task.setDeviceId(sample.getDeviceId());
|
task.setDeviceId(sample.getDeviceId());
|
||||||
task.setCreateTime(sample.getCreateAt());
|
task.setCreateTime(sample.getCreateAt());
|
||||||
return task;
|
return task;
|
||||||
|
@ -55,6 +55,7 @@ public class VideoPieceGetter {
|
|||||||
public Long faceSampleId;
|
public Long faceSampleId;
|
||||||
public Date createTime;
|
public Date createTime;
|
||||||
public Callback callback;
|
public Callback callback;
|
||||||
|
public Long memberId;
|
||||||
|
|
||||||
public static interface Callback {
|
public static interface Callback {
|
||||||
void onInvoke();
|
void onInvoke();
|
||||||
@ -124,11 +125,12 @@ public class VideoPieceGetter {
|
|||||||
log.info("视频裁切成功");
|
log.info("视频裁切成功");
|
||||||
try {
|
try {
|
||||||
InputStream inputStream = new FileInputStream(outFile);
|
InputStream inputStream = new FileInputStream(outFile);
|
||||||
String url = ossUtil.uploadFile(inputStream, "user-video-source", outFile.getName());
|
String url = ossUtil.uploadFile(inputStream, "user-video-source/", outFile.getName());
|
||||||
SourceEntity sourceEntity = new SourceEntity();
|
SourceEntity sourceEntity = new SourceEntity();
|
||||||
sourceEntity.setId(SnowFlakeUtil.getLongId());
|
sourceEntity.setId(SnowFlakeUtil.getLongId());
|
||||||
sourceEntity.setVideoUrl(url);
|
sourceEntity.setVideoUrl(url);
|
||||||
sourceEntity.setFaceSampleId(faceSample.getId());
|
sourceEntity.setFaceSampleId(faceSample.getId());
|
||||||
|
sourceEntity.setMemberId(task.getMemberId());
|
||||||
sourceEntity.setScenicId(faceSample.getScenicId());
|
sourceEntity.setScenicId(faceSample.getScenicId());
|
||||||
sourceEntity.setDeviceId(faceSample.getDeviceId());
|
sourceEntity.setDeviceId(faceSample.getDeviceId());
|
||||||
sourceEntity.setType(1);
|
sourceEntity.setType(1);
|
||||||
|
@ -49,8 +49,10 @@
|
|||||||
</select>
|
</select>
|
||||||
<select id="getById" resultType="com.ycwl.basic.model.pc.video.resp.VideoRespVO">
|
<select id="getById" resultType="com.ycwl.basic.model.pc.video.resp.VideoRespVO">
|
||||||
select v.id, v.scenic_id, member_id, template_id, task_id, worker_id, video_url, v.create_time, v.update_time,
|
select v.id, v.scenic_id, member_id, template_id, task_id, worker_id, video_url, v.create_time, v.update_time,
|
||||||
t.name templateName,t.price templatePrice,v.is_buy isBuy
|
t.name templateName,t.price templatePrice,v.is_buy isBuy,
|
||||||
|
s.name scenicName
|
||||||
from video v
|
from video v
|
||||||
|
left join scenic s on v.scenic_id = s.id
|
||||||
left join template t on v.template_id = t.id
|
left join template t on v.template_id = t.id
|
||||||
where v.id = #{id}
|
where v.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user