blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
fuliqi
2024-10-17 8546b3d285af4235a0ef615a0c6e89486ae2c806 
 src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java


@@ -1,34 +1,29 @@


package com.ycl.jxkg.controller.student;




import com.alibaba.fastjson.JSON;


import com.github.pagehelper.PageInfo;


import com.ycl.jxkg.base.BaseApiController;


import com.ycl.jxkg.base.Result;


import com.ycl.jxkg.domain.*;


import com.ycl.jxkg.domain.ExamPaperAnswerInfo;


import com.ycl.jxkg.domain.entity.ExamPaperScore;


import com.ycl.jxkg.domain.entity.Subject;


import com.ycl.jxkg.domain.entity.User;


import com.ycl.jxkg.domain.entity.UserEventLog;


import com.ycl.jxkg.enums.ExamPaperAnswerStatusEnum;


import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent;


import com.ycl.jxkg.event.UserEvent;


import com.ycl.jxkg.service.ExamPaperScoreService;


import com.ycl.jxkg.service.ExamPaperService;


import com.ycl.jxkg.service.SubjectService;


import com.ycl.jxkg.utils.DateTimeUtil;


import com.ycl.jxkg.utils.ExamUtil;


import com.ycl.jxkg.utils.PageInfoHelper;


import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;


import com.ycl.jxkg.domain.vo.student.exam.ExamPaperReadVO;


import com.ycl.jxkg.domain.vo.PaperFixQuestionVO;


import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkNavbarVO;


import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperScoreVO;


import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO;


import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO;


import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO;


import com.github.pagehelper.PageInfo;


import com.ycl.jxkg.service.ExamPaperScoreService;


import com.ycl.jxkg.service.ExamPaperService;


import com.ycl.jxkg.service.SubjectService;


import com.ycl.jxkg.service.UserService;


import lombok.RequiredArgsConstructor;


import org.springframework.beans.BeanUtils;


import org.springframework.context.ApplicationEventPublisher;


import org.springframework.web.bind.annotation.*;




import javax.validation.Valid;


import java.util.Date;


import java.util.Objects;




@RequiredArgsConstructor


@RestController("StudentExamPaperAnswerController")


@@ -36,6 +31,7 @@


public class ExamPaperAnswerController extends BaseApiController {




    private final ExamPaperScoreService examPaperScoreService;


    private final UserService userService;


    private final ExamPaperService examPaperService;


    private final SubjectService subjectService;


    private final ApplicationEventPublisher eventPublisher;


@@ -44,19 +40,7 @@


    @RequestMapping(value = "/pageList", method = RequestMethod.POST)


    public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageList(@RequestBody @Valid ExamPaperAnswerPageVO model) {


        model.setCreateUser(getCurrentUser().getId());


        PageInfo<ExamPaperScore> pageInfo = examPaperScoreService.studentPage(model);


        PageInfo<ExamPaperAnswerPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {


            ExamPaperAnswerPageResponseVO vo = new ExamPaperAnswerPageResponseVO();


//            BeanUtils.copyProperties(e, vo);


//            Subject subject = subjectService.getById(vo.getSubjectId());


//            vo.setDoTime(ExamUtil.secondToVM(e.getDoTime()));


//            vo.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));


//            vo.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));


//            vo.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));


//            vo.setSubjectName(subject.getName());


//            vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));


            return vo;


        });


        PageInfo<ExamPaperAnswerPageResponseVO> page = examPaperScoreService.studentPage(model);


        return Result.ok(page);


    }




@@ -104,15 +88,15 @@


    }




    @RequestMapping(value = "/read/{id}", method = RequestMethod.POST)


    public Result<ExamPaperReadVO> read(@PathVariable Integer id) {


    public Result<ExamPaperScoreVO> read(@PathVariable Integer id) {


        ExamPaperScore examPaperScore = examPaperScoreService.getById(id);


        ExamPaperReadVO vm = new ExamPaperReadVO();


        ExamPaperEditRequestVO paper = examPaperService.examPaperToVM(examPaperScore.getPaperId());


        ExamPaperSubmitVO answer = examPaperScoreService.examPaperAnswerToVM(examPaperScore.getId());


        vm.setPaper(paper);


        vm.setAnswer(answer);


        return Result.ok(vm);


        ExamPaperScoreVO examPaperScoreVO = new ExamPaperScoreVO();


        BeanUtils.copyProperties(examPaperScore, examPaperScoreVO);


        User user = userService.getById(examPaperScore.getUserId());


        examPaperScoreVO.setUserName(Objects.nonNull(user) ? user.getRealName() : "用户已注销");


        examPaperScoreVO.setNavbar(JSON.parseArray(examPaperScore.getNavbar(), ExamPaperMarkNavbarVO.class));


        examPaperScoreVO.setTitleItems(JSON.parseArray(examPaperScore.getPaperContent(), PaperFixQuestionVO.class));


        return Result.ok(examPaperScoreVO);


    }






}