|
|
|
@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.zh.project0512.annotation.tokenValid;
|
|
|
|
|
import com.zh.project0512.model.UserTask;
|
|
|
|
|
import com.zh.project0512.model.Video;
|
|
|
|
|
import com.zh.project0512.service.IUserAccountService;
|
|
|
|
|
import com.zh.project0512.service.IUserService;
|
|
|
|
|
import com.zh.project0512.service.IUserTaskService;
|
|
|
|
|
import com.zh.project0512.service.IVideoService;
|
|
|
|
@ -46,6 +47,8 @@ public class VideoUController {
|
|
|
|
|
private IUserService userService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private IUserTaskService userTaskService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private IUserAccountService userAccountService;
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
|
static class UserAddParam {
|
|
|
|
@ -66,15 +69,21 @@ public class VideoUController {
|
|
|
|
|
public Result userAdd(@Validated @RequestBody UserAddParam param, @RequestHeader("token") @Parameter(name = "登录token") String token) {
|
|
|
|
|
Claims claims = new JwtUtil().parseJWT(token);
|
|
|
|
|
Integer useId = userService.selByOpenid(claims.getId()).getId();
|
|
|
|
|
// 校验用户和用户账号
|
|
|
|
|
if (useId == null) {
|
|
|
|
|
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户");
|
|
|
|
|
}
|
|
|
|
|
Integer userAccountStatus = userAccountService.userAccountStatus(useId, param.getType());
|
|
|
|
|
if (1 != userAccountStatus) {
|
|
|
|
|
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "账号不可用");
|
|
|
|
|
}
|
|
|
|
|
// 校验任务状态
|
|
|
|
|
Integer taskStatus = userTaskService.userTaskStatus(useId, param.getId());
|
|
|
|
|
if(taskStatus ==null){
|
|
|
|
|
if (taskStatus == null) {
|
|
|
|
|
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "用户未接受任务");
|
|
|
|
|
}else if(taskStatus == 0){
|
|
|
|
|
} else if (taskStatus == 0) {
|
|
|
|
|
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "任务未开始");
|
|
|
|
|
}else if(taskStatus == 2){
|
|
|
|
|
} else if (taskStatus == 2) {
|
|
|
|
|
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "任务已结束");
|
|
|
|
|
}
|
|
|
|
|
videoService.save(new Video().setUserId(useId).setTaskId(param.getId()).setType(param.getType()).setUrl(param.getUrl()).setCreatAt(LocalDateTime.now()));
|
|
|
|
@ -91,11 +100,11 @@ public class VideoUController {
|
|
|
|
|
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户");
|
|
|
|
|
}
|
|
|
|
|
QueryWrapper<Video> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.eq("userId",useId);
|
|
|
|
|
Integer taskId = obj.getInteger("taskId");
|
|
|
|
|
if(taskId != null){
|
|
|
|
|
queryWrapper.eq("taskId",taskId);
|
|
|
|
|
queryWrapper.eq("userId", useId);
|
|
|
|
|
Integer taskId = obj.getInteger("taskId");
|
|
|
|
|
if (taskId != null) {
|
|
|
|
|
queryWrapper.eq("taskId", taskId);
|
|
|
|
|
}
|
|
|
|
|
return Result.success(videoService.page(MybatisPlusUtil.SetPage(obj),queryWrapper));
|
|
|
|
|
return Result.success(videoService.page(MybatisPlusUtil.SetPage(obj), queryWrapper));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|