feat:长三角比赛

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCompetition.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1739,6 +1739,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     .toMinutes();
             classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
 
+            if(classGroup4MixDto.getCourseTimes()<=0){
+                throw new BizException("{}课程类型暂无剩余课程时长", classGroup4MixDto.getCourseType().getMsg());
+            }
+
             int times = 0;
 
             Set<String> holidayDays = new HashSet<>();
@@ -2022,6 +2026,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     .toMinutes();
             classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
 
+            if(classGroup4MixDto.getCourseTimes()<=0){
+                throw new BizException("{}课程类型暂无剩余课程时长", classGroup4MixDto.getCourseType().getMsg());
+            }
+
             int times = 0;
             Set<String> holidayDays = new HashSet<>();
             if (classGroup4MixDto.getHoliday()) {
@@ -2308,6 +2316,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     .toMinutes();
             classGroup4MixDto.setCourseTimes(totalMinutes/(int)courseDuration);
 
+            if(classGroup4MixDto.getCourseTimes()<=0){
+                throw new BizException("{}课程类型暂无剩余课程时长", classGroup4MixDto.getCourseType().getMsg());
+            }
+
             int times = 0;
             Set<String> holidayDays = new HashSet<>();
             if (classGroup4MixDto.getHoliday()) {

mec-student/src/main/java/com/ym/mec/student/controller/StudentCompetitionController.java

@@ -13,10 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Objects;
@@ -54,7 +51,7 @@ public class StudentCompetitionController extends BaseController {
     }
 
     @ApiOperation(value = "新增参赛作品")
-    @PostMapping("/checkIsUpload")
+    @GetMapping("/checkIsUpload")
     public HttpResponseResult<StudentCompetition> checkIsUpload(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
@@ -64,13 +61,13 @@ public class StudentCompetitionController extends BaseController {
     }
 
     @ApiOperation(value = "获取获奖名单")
-    @PostMapping("/getWinnerList")
+    @GetMapping("/getWinnerList")
     public HttpResponseResult<List<StudentCompetitionRankingDto>> getWinnerList(){
         return succeed(studentCompetitionService.getWinnerList());
     }
 
     @ApiOperation(value = "获取指定参赛作品详情")
-    @PostMapping("/get")
+    @GetMapping("/get")
     public HttpResponseResult<StudentCompetition> get(Long competitionId){
         StudentCompetition studentCompetition = studentCompetitionService.get(competitionId);
         if(Objects.isNull(studentCompetition)||!studentCompetition.isShow()){