deason 1 éve
szülő
commit
f977fdc2dd

+ 4 - 4
src/main/java/com/qmth/exam/reserve/controller/student/StudentApplyController.java

@@ -66,13 +66,13 @@ public class StudentApplyController extends BaseController {
     @ApiOperation(value = "获取考试须知")
     @ApiOperation(value = "获取考试须知")
     @PostMapping(value = "/exam/notice")
     @PostMapping(value = "/exam/notice")
     public RichTextBean examNotice(@ApiParam("预约任务ID") @RequestParam Long applyTaskId) {
     public RichTextBean examNotice(@ApiParam("预约任务ID") @RequestParam Long applyTaskId) {
-        return examReserveService.getExamNotice(curLoginStudent().getId(), applyTaskId);
+        return examReserveService.getExamNotice(applyTaskId);
     }
     }
 
 
     @ApiOperation(value = "获取考场引导")
     @ApiOperation(value = "获取考场引导")
-    @PostMapping(value = "/exam/room/guide")
-    public RichTextBean examRoomGuide(@ApiParam("考场ID") @RequestParam Long examRoomId) {
-        return examReserveService.getExamRoomGuide(curLoginStudent().getId(), examRoomId);
+    @PostMapping(value = "/exam/site/guide")
+    public RichTextBean examSiteGuide(@ApiParam("考点ID") @RequestParam Long examSiteId) {
+        return examReserveService.getExamSiteGuide(examSiteId);
     }
     }
 
 
     @ApiOperation(value = "获取可预约的“日期”列表")
     @ApiOperation(value = "获取可预约的“日期”列表")

+ 2 - 2
src/main/java/com/qmth/exam/reserve/service/ExamReserveService.java

@@ -23,8 +23,8 @@ public interface ExamReserveService {
 
 
     ApplyTimePeriodResult getApplyTimePeriodList(Long studentId, Long examSiteId, String date);
     ApplyTimePeriodResult getApplyTimePeriodList(Long studentId, Long examSiteId, String date);
 
 
-    RichTextBean getExamNotice(Long studentId, Long applyTaskId);
+    RichTextBean getExamNotice(Long applyTaskId);
 
 
-    RichTextBean getExamRoomGuide(Long studentId, Long examRoomId);
+    RichTextBean getExamSiteGuide(Long examSiteId);
 
 
 }
 }

+ 73 - 6
src/main/java/com/qmth/exam/reserve/service/impl/ExamReserveServiceImpl.java

@@ -7,9 +7,14 @@ import com.qmth.exam.reserve.bean.RichTextBean;
 import com.qmth.exam.reserve.bean.apply.ApplyTimePeriodResult;
 import com.qmth.exam.reserve.bean.apply.ApplyTimePeriodResult;
 import com.qmth.exam.reserve.bean.apply.ApplyVO;
 import com.qmth.exam.reserve.bean.apply.ApplyVO;
 import com.qmth.exam.reserve.bean.apply.TicketInfo;
 import com.qmth.exam.reserve.bean.apply.TicketInfo;
+import com.qmth.exam.reserve.bean.apply.TimePeriodInfo;
 import com.qmth.exam.reserve.dao.StudentApplyDao;
 import com.qmth.exam.reserve.dao.StudentApplyDao;
+import com.qmth.exam.reserve.entity.ApplyTaskEntity;
+import com.qmth.exam.reserve.entity.ExamSiteEntity;
 import com.qmth.exam.reserve.entity.StudentApplyEntity;
 import com.qmth.exam.reserve.entity.StudentApplyEntity;
+import com.qmth.exam.reserve.service.ApplyTaskService;
 import com.qmth.exam.reserve.service.ExamReserveService;
 import com.qmth.exam.reserve.service.ExamReserveService;
+import com.qmth.exam.reserve.service.ExamSiteService;
 import com.qmth.exam.reserve.service.StudentApplyService;
 import com.qmth.exam.reserve.service.StudentApplyService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -18,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
@@ -28,9 +34,22 @@ public class ExamReserveServiceImpl implements ExamReserveService {
     @Autowired
     @Autowired
     private StudentApplyService studentApplyService;
     private StudentApplyService studentApplyService;
 
 
+    @Autowired
+    private ApplyTaskService applyTaskService;
+
+    @Autowired
+    private ExamSiteService examSiteService;
+
     @Override
     @Override
     @Transactional
     @Transactional
     public void saveStudentApply(Long studentId, Long examSiteId, Long timePeriodId) {
     public void saveStudentApply(Long studentId, Long examSiteId, Long timePeriodId) {
+        if (examSiteId == null) {
+            throw new StatusException("考点ID不能为空");
+        }
+        if (timePeriodId == null) {
+            throw new StatusException("预约时段ID不能为空");
+        }
+
         LambdaQueryWrapper<StudentApplyEntity> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<StudentApplyEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StudentApplyEntity::getStudentId, studentId);
         wrapper.eq(StudentApplyEntity::getStudentId, studentId);
         wrapper.eq(StudentApplyEntity::getExamSiteId, examSiteId);
         wrapper.eq(StudentApplyEntity::getExamSiteId, examSiteId);
@@ -116,22 +135,70 @@ public class ExamReserveServiceImpl implements ExamReserveService {
 
 
     @Override
     @Override
     public List<String> getApplyDateList(Long studentId) {
     public List<String> getApplyDateList(Long studentId) {
-        return null;
+        List<String> dateList = new ArrayList<>();
+        dateList.add("20240410");
+        dateList.add("20240411");
+        dateList.add("20240412");
+        // todo
+        return dateList;
     }
     }
 
 
     @Override
     @Override
     public ApplyTimePeriodResult getApplyTimePeriodList(Long studentId, Long examSiteId, String date) {
     public ApplyTimePeriodResult getApplyTimePeriodList(Long studentId, Long examSiteId, String date) {
-        return null;
+        if (examSiteId == null) {
+            throw new StatusException("考点ID不能为空");
+        }
+        if (StringUtils.isEmpty(date)) {
+            throw new StatusException("预约日期不能为空");
+        }
+
+        ApplyTimePeriodResult result = new ApplyTimePeriodResult();
+        result.setUnApplyNumber(1);
+
+        List<TimePeriodInfo> periodList = new ArrayList<>();
+        TimePeriodInfo period = new TimePeriodInfo();
+        period.setTimePeriodId(1L);
+        period.setTimePeriodStart(System.currentTimeMillis());
+        period.setTimePeriodEnd(System.currentTimeMillis() + 10000);
+        period.setStatus("");
+        period.setAvailableCount(1);
+        periodList.add(period);
+        result.setPeriodList(periodList);
+
+        // todo
+        return result;
     }
     }
 
 
     @Override
     @Override
-    public RichTextBean getExamNotice(Long studentId, Long applyTaskId) {
-        return null;
+    public RichTextBean getExamNotice(Long applyTaskId) {
+        if (applyTaskId == null) {
+            throw new StatusException("预约任务ID不能为空");
+        }
+
+        ApplyTaskEntity applyTask = applyTaskService.getById(applyTaskId);
+        if (applyTask == null) {
+            throw new StatusException("考试须知信息不存在");
+        }
+
+        RichTextBean bean = new RichTextBean();
+        bean.setContent(applyTask.getNotice());
+        return bean;
     }
     }
 
 
     @Override
     @Override
-    public RichTextBean getExamRoomGuide(Long studentId, Long examRoomId) {
-        return null;
+    public RichTextBean getExamSiteGuide(Long examSiteId) {
+        if (examSiteId == null) {
+            throw new StatusException("考点ID不能为空");
+        }
+
+        ExamSiteEntity examSite = examSiteService.getById(examSiteId);
+        if (examSite == null) {
+            throw new StatusException("考场引导信息不存在");
+        }
+
+        RichTextBean bean = new RichTextBean();
+        bean.setContent(examSite.getGuide());
+        return bean;
     }
     }
 
 
 }
 }