|
@@ -11,6 +11,7 @@ import cn.rankin.common.utils.constant.DownloadStatus;
|
|
|
import cn.rankin.data.api.app.vo.*;
|
|
|
import cn.rankin.data.api.auth.vo.AuthResult;
|
|
|
import cn.rankin.data.api.user.entity.DownloadInfo;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
@@ -37,7 +38,9 @@ public class CourseController {
|
|
|
private DownloadInfoService downloadInfoService;
|
|
|
|
|
|
@RequestMapping(value = "/{courseId}/lessons", method = RequestMethod.GET)
|
|
|
- public APIResult<CourseVo> getCourseLessons(@NeedUser DeviceUserVo user, @PathVariable("courseId") String courseId) {
|
|
|
+ public APIResult<CourseVo> getCourseLessons(@NeedUser DeviceUserVo user,
|
|
|
+ @PathVariable("courseId") String courseId,
|
|
|
+ @RequestParam(name="mac",required =false) String mac) {
|
|
|
String userId = user.getUid();
|
|
|
String merchantId = user.getMerchantId();
|
|
|
APIResult<CourseVo> apiResult = productService.getCourseLessons(courseId);
|
|
@@ -53,14 +56,15 @@ public class CourseController {
|
|
|
List<LessonVo> data = new ArrayList<>();
|
|
|
List<LessonVo> lessonVos = courseVo.getList();
|
|
|
lessonVos.forEach( vo -> {
|
|
|
- //TODO
|
|
|
- DownloadInfo downloadInfo = downloadInfoService.findByLessonUserId(userId, vo.getId(),"");
|
|
|
- if(null != downloadInfo && DownloadStatus.FINISH_DOWNLOAD == downloadInfo.getDownloadStatus()){
|
|
|
- vo.setDownloadStatus(DownloadStatus.FINISH_DOWNLOAD);
|
|
|
- }else if(null != downloadInfo && DownloadStatus.PROCESS_DOWNLOAD == downloadInfo.getDownloadStatus()){
|
|
|
- vo.setDownloadStatus(DownloadStatus.PROCESS_DOWNLOAD);
|
|
|
- }else if(null != downloadInfo && DownloadStatus.FAIL_DOWNLOAD == downloadInfo.getDownloadStatus()){
|
|
|
- vo.setDownloadStatus(DownloadStatus.FAIL_DOWNLOAD);
|
|
|
+ if(StringUtils.isNotBlank(mac)){
|
|
|
+ DownloadInfo downloadInfo = downloadInfoService.findByLessonUserId(userId, vo.getId(), mac);
|
|
|
+ if(null != downloadInfo && DownloadStatus.FINISH_DOWNLOAD == downloadInfo.getDownloadStatus()){
|
|
|
+ vo.setDownloadStatus(DownloadStatus.FINISH_DOWNLOAD);
|
|
|
+ }else if(null != downloadInfo && DownloadStatus.PROCESS_DOWNLOAD == downloadInfo.getDownloadStatus()){
|
|
|
+ vo.setDownloadStatus(DownloadStatus.PROCESS_DOWNLOAD);
|
|
|
+ }else if(null != downloadInfo && DownloadStatus.FAIL_DOWNLOAD == downloadInfo.getDownloadStatus()){
|
|
|
+ vo.setDownloadStatus(DownloadStatus.FAIL_DOWNLOAD);
|
|
|
+ }
|
|
|
}
|
|
|
data.add(vo);
|
|
|
});
|