|
@@ -12,11 +12,11 @@ import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
|
|
|
|
|
|
import com.yonge.cooleshow.biz.dal.vo.*;
|
|
|
|
|
|
+import com.yonge.toolset.base.util.StringUtil;
|
|
|
import com.yonge.toolset.mybatis.support.PageUtil;
|
|
|
import com.yonge.cooleshow.biz.dal.valid.AddGroup;
|
|
|
import com.yonge.cooleshow.biz.dal.valid.UpdateGroup;
|
|
|
import com.yonge.toolset.base.page.PageInfo;
|
|
|
-import io.netty.util.internal.StringUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
@@ -33,12 +33,14 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
|
import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
|
|
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
/**
|
|
|
* 视频课基本信息表 web 控制层
|
|
|
+ *
|
|
|
* @author yzp
|
|
|
- * @date 2022-03-26 00:21:46
|
|
|
* @version v1.0
|
|
|
+ * @date 2022-03-26 00:21:46
|
|
|
**/
|
|
|
@RestController
|
|
|
@RequestMapping("/videoLessonGroup")
|
|
@@ -52,11 +54,12 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private AppVersionInfoService appVersionInfoService;
|
|
|
+
|
|
|
/**
|
|
|
- * @Description: 查询视频课组
|
|
|
- * @Author: cy
|
|
|
- * @Date: 2022/3/31
|
|
|
- */
|
|
|
+ * @Description: 查询视频课组
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/3/31
|
|
|
+ */
|
|
|
@ApiOperation(value = "查询视频课组")
|
|
|
@PostMapping(value = "/page")
|
|
|
public HttpResponseResult<PageInfo<VideoLessonGroupVo>> page(@RequestBody VideoLessonGroupSearch query) {
|
|
@@ -68,7 +71,7 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
query.setTeacherId(sysUser.getId());
|
|
|
} else {
|
|
|
// 检查app版本
|
|
|
- query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
|
|
|
+ query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(), query.getVersion()));
|
|
|
}
|
|
|
if (query.getMyself() != null && !query.getMyself()) {
|
|
|
query.setAuditStatus(AuthStatusEnum.PASS.getCode());
|
|
@@ -78,10 +81,10 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @Description: 新增视频课组
|
|
|
- * @Author: cy
|
|
|
- * @Date: 2022/3/31
|
|
|
- */
|
|
|
+ * @Description: 新增视频课组
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/3/31
|
|
|
+ */
|
|
|
@ApiOperation(value = "新增视频课组", httpMethod = "POST", consumes = "application/json", produces = "application/json")
|
|
|
@PostMapping(value = "/create", consumes = "application/json", produces = "application/json")
|
|
|
public HttpResponseResult<Object> create(@Validated @RequestBody VideoLessonGroup videoLessonGroup) {
|
|
@@ -96,10 +99,10 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @Description: 修改视频课组
|
|
|
- * @Author: cy
|
|
|
- * @Date: 2022/3/31
|
|
|
- */
|
|
|
+ * @Description: 修改视频课组
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/3/31
|
|
|
+ */
|
|
|
@ApiOperation(value = "修改视频课组", httpMethod = "POST", consumes = "application/json", produces = "application/json")
|
|
|
@PostMapping(value = "/updateGroup", consumes = "application/json", produces = "application/json")
|
|
|
public HttpResponseResult<Object> update(@Validated @RequestBody VideoLessonGroupUpVo lessonGroupUpVo) {
|
|
@@ -108,10 +111,10 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @Description: 删除视频课组
|
|
|
- * @Author: cy
|
|
|
- * @Date: 2022/3/31
|
|
|
- */
|
|
|
+ * @Description: 删除视频课组
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/3/31
|
|
|
+ */
|
|
|
@ApiOperation(value = "删除视频课组", httpMethod = "POST", consumes = "application/json", produces = "application/json")
|
|
|
@PostMapping("/delete/{id}")
|
|
|
public Object delete(@PathVariable Long id) {
|
|
@@ -120,22 +123,22 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @Description: 新增视频课组&视频课
|
|
|
- * @Author: cy
|
|
|
- * @Date: 2022/4/1
|
|
|
- */
|
|
|
+ * @Description: 新增视频课组&视频课
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/4/1
|
|
|
+ */
|
|
|
@ApiOperation(value = "新增视频课组&视频课", httpMethod = "POST", consumes = "application/json", produces = "application/json")
|
|
|
@PostMapping(value = "/add", consumes = "application/json", produces = "application/json")
|
|
|
public HttpResponseResult<Object> add(@Validated(AddGroup.class) @RequestBody VideoLessonVo lessonVo) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
|
|
|
- if (sysUser == null||sysUser.getId()==null) {
|
|
|
+ if (sysUser == null || sysUser.getId() == null) {
|
|
|
return failed("用户信息获取失败");
|
|
|
}
|
|
|
if (CollectionUtils.isEmpty(lessonVo.getLessonList())) {
|
|
|
return failed("课程不能为空");
|
|
|
}
|
|
|
- videoLessonGroupService.add(lessonVo,sysUser);
|
|
|
+ videoLessonGroupService.add(lessonVo, sysUser);
|
|
|
return succeed();
|
|
|
}
|
|
|
|
|
@@ -145,7 +148,7 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
* @Date: 2022/4/2
|
|
|
*/
|
|
|
@ApiOperation(value = "根据组id查询视频课&视频课组")
|
|
|
- @GetMapping(value="/selectVideoLesson")
|
|
|
+ @GetMapping(value = "/selectVideoLesson")
|
|
|
public HttpResponseResult<VideoLessonStudentVo> selectVideoLesson(@NotNull(message = "视频组id不能为空") Long groupId) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null || sysUser.getId() == null) {
|
|
@@ -153,7 +156,7 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
}
|
|
|
|
|
|
VideoLessonStudentVo videoLessonStudentVo = videoLessonGroupService.selectVideoLesson(groupId);
|
|
|
- if (videoLessonStudentVo.getLessonGroup().getTeacherId().equals(sysUser.getId())) {
|
|
|
+ if (videoLessonStudentVo.getLessonGroup().getTeacherId().equals(sysUser.getId())) {
|
|
|
videoLessonStudentVo.setMyself(true);
|
|
|
} else {
|
|
|
videoLessonStudentVo.setMyself(false);
|
|
@@ -164,7 +167,31 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
videoLessonStudentVo.setAlreadyBuy(false);
|
|
|
}
|
|
|
return succeed(videoLessonStudentVo);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Description: 更新上架状态
|
|
|
+ * @Author: cy
|
|
|
+ * @Date: 2022/4/25
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "更新上架状态", httpMethod = "POST", consumes = "application/json", produces = "application/json")
|
|
|
+ @PostMapping(value = "/updateShelves", consumes = "application/json", produces = "application/json")
|
|
|
+ public HttpResponseResult<Object> updateShelves(@Validated @RequestBody VideoLessonShelvesVo shelvesVo) {
|
|
|
+ SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
+ if (user == null || null == user.getId()) {
|
|
|
+ return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
+ }
|
|
|
+ if (shelvesVo.getShelvesFlag() != 0) {
|
|
|
+ return failed("只能做下架操作");
|
|
|
+ }
|
|
|
+ if (shelvesVo.getShelvesFlag() == 0 && StringUtil.isEmpty(shelvesVo.getShelvesReason())) {
|
|
|
+ return failed("下架必须要有下架原因");
|
|
|
+ }
|
|
|
|
|
|
+ shelvesVo.setShelvesId(user.getId());
|
|
|
+ shelvesVo.setShelvesTime(new Date());
|
|
|
+ videoLessonGroupService.updateShelves(shelvesVo);
|
|
|
+ return succeed();
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -177,13 +204,13 @@ public class VideoLessonGroupController extends BaseController {
|
|
|
public HttpResponseResult<Object> update(@Validated(UpdateGroup.class) @RequestBody VideoLessonVo lessonVo) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
|
|
|
- if (sysUser == null||sysUser.getId()==null) {
|
|
|
+ if (sysUser == null || sysUser.getId() == null) {
|
|
|
return failed("用户信息获取失败");
|
|
|
}
|
|
|
if (CollectionUtils.isEmpty(lessonVo.getLessonList())) {
|
|
|
return failed("课程不能为空");
|
|
|
}
|
|
|
- videoLessonGroupService.update(lessonVo,sysUser);
|
|
|
+ videoLessonGroupService.update(lessonVo, sysUser);
|
|
|
return succeed();
|
|
|
}
|
|
|
|