q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
Jerry Yan
2025-02-14 18:18:21 +08:00
parent b4b6d93e2f
commit cfb9392068
26 changed files with 404 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/ycwl/basic/service/impl/pc/FaceServiceImpl.java
View File

@@ -8,7 +8,6 @@ import com.ycwl.basic.mapper.FaceSampleMapper;
import com.ycwl.basic.mapper.SourceMapper;
import com.ycwl.basic.mapper.StatisticsMapper;
import com.ycwl.basic.mapper.FaceMapper;
import com.ycwl.basic.model.jwt.JwtInfo;
import com.ycwl.basic.model.mobile.face.FaceRecognizeResp;
import com.ycwl.basic.model.mobile.order.IsBuyRespVO;
import com.ycwl.basic.model.mobile.statistic.req.StatisticsRecordAddReq;
@@ -113,12 +112,8 @@ public class FaceServiceImpl implements FaceService {
}
@Override
// @Transactional(rollbackFor = Exception.class)
public ApiResponse faceUpload(MultipartFile file, Long scenicId) {
//获取用户id
JwtInfo worker = JwtTokenUtil.getWorker();
Long userId = worker.getUserId();
log.info("当前登录用户信息：{}",worker);
public FaceRecognizeResp faceUpload(MultipartFile file, Long scenicId, Long userId) {
//1、上传人脸照片
IStorageAdapter adapter = StorageFactory.use("faces");
@@ -188,7 +183,7 @@ public class FaceServiceImpl implements FaceService {
resp.setUrl(faceUrl);
resp.setFaceId(newFaceId);
matchFaceId(newFaceId, oldFaceId == null);
return ApiResponse.success(resp);
return resp;
}
@Override

16
src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
View File

@@ -29,6 +29,8 @@ import com.ycwl.basic.model.pc.video.entity.VideoEntity;
import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
import com.ycwl.basic.model.wx.WXPayOrderReqVO;
import com.ycwl.basic.model.wx.WxPayRespVO;
import com.ycwl.basic.repository.VideoRepository;
import com.ycwl.basic.repository.VideoTaskRepository;
import com.ycwl.basic.service.mobile.GoodsService;
import com.ycwl.basic.service.mobile.WxPayService;
import com.ycwl.basic.service.pc.OrderService;
@@ -76,6 +78,10 @@ public class OrderServiceImpl implements OrderService {
private OrderBiz orderBiz;
@Autowired
private TaskTaskServiceImpl taskTaskServiceImpl;
@Autowired
private VideoRepository videoRepository;
@Autowired
private VideoTaskRepository videoTaskRepository;
@Override
public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
@@ -109,9 +115,9 @@ public class OrderServiceImpl implements OrderService {
}
} else {
item.setCoverList(Collections.singletonList(item.getCoverUrl()));
VideoRespVO videoMapperById = videoMapper.getById(item.getGoodsId());
VideoEntity videoMapperById = videoRepository.getVideoByTaskId(item.getGoodsId());
if (videoMapperById != null) {
item.setShootingTime(taskTaskServiceImpl.getTaskShotDate(videoMapperById.getTaskId()));
item.setShootingTime(videoTaskRepository.getTaskShotDate(videoMapperById.getTaskId()));
item.setVideoUrl(videoMapperById.getVideoUrl());
}
}
@@ -229,9 +235,9 @@ public class OrderServiceImpl implements OrderService {
}
} else {
item.setCoverList(Collections.singletonList(item.getCoverUrl()));
VideoRespVO videoMapperById = videoMapper.getById(item.getGoodsId());
if (videoMapperById != null) {
item.setShootingTime(taskTaskServiceImpl.getTaskShotDate(videoMapperById.getTaskId()));
VideoEntity video = videoRepository.getVideo(item.getGoodsId());
if (video != null) {
item.setShootingTime(videoTaskRepository.getTaskShotDate(video.getTaskId()));
}
}
});

30
src/main/java/com/ycwl/basic/service/impl/pc/VideoServiceImpl.java
View File

@@ -42,34 +42,4 @@ public class VideoServiceImpl implements VideoService {
return ApiResponse.success(videoMapper.getById(id));
}
@Override
public ApiResponse<Boolean> add(VideoEntity video) {
video.setId(SnowFlakeUtil.getLongId());
int i = videoMapper.add(video);
if (i > 0) {
return ApiResponse.success(true);
}else {
return ApiResponse.fail("成片新增失败");
}
}
@Override
public ApiResponse<Boolean> deleteById(Long id) {
int i = videoMapper.deleteById(id);
if (i > 0) {
return ApiResponse.success(true);
}else {
return ApiResponse.fail("成片删除失败");
}
}
@Override
public ApiResponse<Boolean> update(VideoEntity video) {
int i = videoMapper.update(video);
if (i > 0) {
return ApiResponse.success(true);
}else {
return ApiResponse.fail("成片修改失败");
}
}
}