完善保存

src/main/java/com/xhkjedu/controller/EPaperVerifyController.java

@@ -4,6 +4,7 @@ import com.xhkjedu.model.EClassStudent;
 import com.xhkjedu.model.EPaperStudent0608;
 import com.xhkjedu.service.EPaperVerifyService;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.PaperStudentParams;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -53,4 +54,14 @@ public class EPaperVerifyController {
         return new ResultVo(0, "识别成功！");
     }
 
+    //识别保存
+    @PostMapping("/correct_save")
+    public ResultVo correctSave(@RequestBody PaperStudentParams ps) {
+        Integer epid = ps.getEpid();
+        Integer studentid = ps.getStudentid();
+        N_Utils.validation(new Object[]{epid, "试卷id", 1,studentid, "学生id", 1});
+        ePaperVerifyService.correctSave(ps);
+        return new ResultVo(0, "保存成功！");
+    }
+
 }

src/main/java/com/xhkjedu/interceptors/RequestInterceptor.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.interceptors;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Configuration
+@Slf4j
+public class RequestInterceptor implements HandlerInterceptor {
+    @Override
+    public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3) {
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3) {
+
+    }
+
+    /**
+     * 在调用controller具体方法前拦截
+     */
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        //log.info("请求的uri:" + request.getRequestURI());
+        //response.setHeader("Access-Control-Allow-Origin", "*");//WebMvcConfg已经设置了跨越，重复设置失效
+        response.setContentType("application/json;charset=UTF-8");
+
+        // 记录请求开始时间
+        /*request.setAttribute("_startTime", System.currentTimeMillis());
+        String requestURI = request.getRequestURI();
+        String key = request.getHeader("Token-Key");
+        String token = request.getHeader("Token-Value");
+        if (!requestURI.contains("user/login") && !requestURI.endsWith("/get_new")
+                && ToolUtils.isNotEmpty(key) && ToolUtils.isNotEmpty(token)) {//非登录和获取最新版本相关接口验证token
+            String redis_token = get(key);//系统缓存中保存的token
+            if (!token.equals(redis_token)) {
+                ResultVo result = new ResultVo();
+                result.setCode(2);
+                result.setMsg("登录失效");
+
+                response.getWriter().print(JSON.toJSONString(result));
+                return false;
+            } else {
+                refreshToken(key, redis_token);//刷新token
+            }
+        }*/
+        return true;
+    }
+}

src/main/java/com/xhkjedu/interceptors/WebMvcConfg.java

@@ -0,0 +1,54 @@
+package com.xhkjedu.interceptors;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author WN
+ * @Description 跨域（协议、域名、端口、子域名不一致）解决方案
+ * 1、返回新的CorsFilter
+ * 2、重写WebMvcConfigurer
+ * 3、使用注解@CrossOrigin
+ * 4、手动设置响应头(HttpServletResponse)
+ * 前两种属于全局设置，后两种属于局部设置；如果使用了局部设置会覆盖全局的设置，可以通过@CrossOrigin进行细粒度控制
+ * 2.4.0之前用allowedOrigins("*")，之后用allowedOriginPatterns("*")
+ * @Date 2019/4/3 15:50
+ **/
+@Configuration
+public class WebMvcConfg implements WebMvcConfigurer {
+
+    @Resource
+    private RequestInterceptor requestInterceptor;
+
+    /**
+     * 拦截器addPathPatterns用于添加拦截规则 excludePathPatterns 用于排除拦截
+     * @Param registry
+     * @Return void
+     * @Author wn
+     * @Date 2019/4/8
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(requestInterceptor).addPathPatterns("/**");
+    }
+
+    /**
+     * 允许跨域
+     * @Param registry
+     * @Return void
+     * @Author wn
+     * @Date 2019/4/8
+     */
+    @Override
+    public void addCorsMappings(CorsRegistry registry){
+        registry.addMapping("/**")
+                .allowedOriginPatterns("*")
+                .allowCredentials(true)
+                .allowedMethods("GET","POST")
+                .maxAge(3600);
+    }
+}

src/main/java/com/xhkjedu/mapper/EPaperVerifyMapper.java

@@ -41,4 +41,15 @@ public interface EPaperVerifyMapper {
 
     //修改新表试卷状态
     void updateStuPaper0608(@Param("p")EPaperStudent0608 p);
+
+    //获取试卷中主观题
+    List<EPaperStudentQuestion> listQuestionZGT(@Param("epid") Integer epid,@Param("studentid") Integer studentid);
+
+    //获取学生试卷
+    EPaperStudent getStuPaperInfo(@Param("epid") Integer epid,@Param("studentid") Integer studentid);
+
+    //清空学生试卷
+    void clearPaperStu(@Param("epid") Integer epid,@Param("studentid") Integer studentid);
+    //清空学生试卷试题
+    void clearPaperStuQues(@Param("epid") Integer epid,@Param("studentid") Integer studentid);
 }

src/main/java/com/xhkjedu/service/EPaperVerifyService.java

@@ -47,67 +47,78 @@ public class EPaperVerifyService {
     public void correctSave(PaperStudentParams psParams){
         Integer epid = psParams.getEpid();
         Integer studentid = psParams.getStudentid();
-
-        //是否验证0待验证1验证通过2验证不通过
-        if(psParams.getVerified() == 2){
-            EPaperStudent paperStudent = new EPaperStudent();
-            paperStudent.setEpid(epid);
-            paperStudent.setStudentid(studentid);
-            paperStudent.setVerified(2);
-            ePaperVerifyMapper.updateStuPaperVerified(paperStudent);
-
-            //验证不通过，更改状态
-            EPaperStudent0608 ps0608 = new EPaperStudent0608();
-            ps0608.setEpid(epid);
-            ps0608.setStudentid(studentid);
-            ps0608.setVerified(2);
-            ps0608.setSamed(0);
-            ePaperVerifyMapper.updateStuPaper0608(ps0608);
-        }else{
-            //获取原试卷答案，
-            List<EPaperQtypeQuestion> questions = ePaperVerifyMapper.listPaperAnswer(psParams.getEpid());
-            List<EPaperStudentQuestion> stuQues = psParams.getQuestions();
-
-            Double paperscore = 0D;//学生试卷得分
-
-            for(EPaperStudentQuestion psq : stuQues){
-                EPaperQtypeQuestion pqtypeQues = questions.stream().filter(a -> a.getEptqid().equals(psq.getEptqid())).findFirst().orElse(null);
-                setCommitQuestion(psq,pqtypeQues);
-
-                paperscore = N_Utils.add(paperscore, psq.getStuscore());
-                psq.setStudentid(studentid);
-                psq.setEpid(epid);
-            }
-            ePaperVerifyMapper.updateBatchStuQuestion(stuQues);
-
-            EPaperStudent paperStudent = new EPaperStudent();
-            paperStudent.setEpid(epid);
-            paperStudent.setStudentid(studentid);
-            paperStudent.setStuscore(paperscore);
-            paperStudent.setStupic(psParams.getStupic());
-            paperStudent.setPagenum(psParams.getPagenum());
-            paperStudent.setSstate(2);
-            paperStudent.setChecked(2);
-            paperStudent.setVerified(1);
-            ePaperVerifyMapper.updateStuPaper(paperStudent);
-
-            EPaperStudent0608 ps0608 = new EPaperStudent0608();
-            ps0608.setEpid(epid);
-            ps0608.setStudentid(studentid);
-            ps0608.setVerified(1);
-            ps0608.setSamed(psParams.getSamed());
-            ePaperVerifyMapper.updateStuPaper0608(ps0608);
+        Integer newstudentid = psParams.getNewstudentid();
+        Integer samed = 2; //是否和以前一致1一致2不一致
+        if(N_Utils.isTrueInteger(newstudentid) && studentid.equals(newstudentid)){
+            samed = 1;
+            newstudentid = studentid;
         }
+        //获取原试卷答案，
+        List<EPaperQtypeQuestion> questions = ePaperVerifyMapper.listPaperAnswer(psParams.getEpid());
+
+        List<EPaperStudentQuestion> stuQues = psParams.getQuestions();//仅包含客观题
+
+        List<EPaperStudentQuestion> saveQues = new ArrayList<>();
 
+        Double paperscore = 0D;//学生试卷得分
+
+        for(EPaperStudentQuestion psq : stuQues){
+            EPaperQtypeQuestion pqtypeQues = questions.stream().filter(a -> a.getEptqid().equals(psq.getEptqid())).findFirst().orElse(null);
+            setCommitQuestion(psq,pqtypeQues);
+
+            paperscore = N_Utils.add(paperscore, psq.getStuscore());
+            psq.setStudentid(newstudentid);
+            psq.setEpid(epid);
+            saveQues.add(psq);
+        }
 
+        //获取试卷中主观题
+        List<EPaperStudentQuestion> stuQuesZgt = ePaperVerifyMapper.listQuestionZGT(epid,studentid);
+        for(EPaperStudentQuestion psqZgt : stuQuesZgt){
+            psqZgt.setStudentid(newstudentid);
+            paperscore = N_Utils.add(paperscore, psqZgt.getStuscore());
+            saveQues.add(psqZgt);
+        }
 
+        ePaperVerifyMapper.updateBatchStuQuestion(saveQues);
+
+        //获取原试卷信息
+        EPaperStudent ps = ePaperVerifyMapper.getStuPaperInfo(epid,studentid);
+
+        //更改新学生信息
+        EPaperStudent paperStudent = new EPaperStudent();
+        paperStudent.setEpid(epid);
+        paperStudent.setStudentid(newstudentid);
+        paperStudent.setStuscore(paperscore);
+        paperStudent.setStupic(ps.getStupic());
+        paperStudent.setPagenum(ps.getPagenum());
+        paperStudent.setBatchid(ps.getBatchid());
+        paperStudent.setSstate(2);
+        paperStudent.setChecked(2);
+        paperStudent.setVerified(1);
+        ePaperVerifyMapper.updateStuPaper(paperStudent);
+
+        EPaperStudent0608 ps0608 = new EPaperStudent0608();
+        ps0608.setEpid(epid);
+        ps0608.setStudentid(newstudentid);
+        ps0608.setVerified(1);
+        ps0608.setSamed(samed);
+        ePaperVerifyMapper.updateStuPaper0608(ps0608);
+
+        if(samed == 2){
+            //说明学生信息布一致，清空表中原学生试卷及试题信息
+            ePaperVerifyMapper.clearPaperStuQues(epid,studentid);
+            ePaperVerifyMapper.clearPaperStu(epid,studentid);
+        }
     }
 
     //判断单道题情况
     private void setCommitQuestion(EPaperStudentQuestion psq, EPaperQtypeQuestion answerVo) {
         int timestamp = N_Utils.getSecondTimestamp();
-        psq.setAnswertime(timestamp);
-        int coverted = 1;//是否转换0未转换1已转换2转换失败
+        if(!N_Utils.isTrueInteger(psq.getAnswertime())){
+            psq.setAnswertime(timestamp);
+        }
+
         String stuanswer = psq.getStuanswer();
         String stuanswertxt = psq.getStuanswertxt();
         Double stuscore = 0D;
@@ -164,13 +175,9 @@ public class EPaperVerifyService {
                             }
                         }
                     }
-
                     psq.setChecked(2);
                     psq.setChecktime(timestamp);
                 } else {
-                    if (stuanswers.size() > 1) {
-                        coverted = 0;//上传的多张图片设为0未转换
-                    }
                     psq.setChecked(0);
                 }
             } else {
@@ -198,8 +205,6 @@ public class EPaperVerifyService {
             }
             psq.setStuscore(stuscore);
         }
-
-        psq.setConverted(coverted);
     }
 
 

src/main/java/com/xhkjedu/vo/PaperStudentParams.java

@@ -17,6 +17,8 @@ public class PaperStudentParams {
 
     private Integer studentid;//学生id
 
+    private Integer newstudentid;//新选择学生id
+
     //试卷学生id
     private Integer epsid;
 

src/main/resources/EPaperVerifyMapper.xml

@@ -67,7 +67,10 @@
     <update id="updateBatchStuQuestion">
         <foreach collection="list" item="q" separator=";">
             update e_paper_student_question set answered=#{q.answered},answertype=#{q.answertype},stuanswer=#{q.stuanswer}
-            ,stuanswertxt=#{q.stuanswertxt},converted=#{q.converted}
+            ,stuanswertxt=#{q.stuanswertxt}
+            <if test="q.converted!=null">
+                ,converted=#{q.converted}
+            </if>
             <if test="q.answertime!=null">
                 ,answertime=#{q.answertime}
             </if>
@@ -95,4 +98,26 @@
     <update id="updateStuPaper0608">
         update e_paper_student0608 set verified=#{p.verified},samed=#{p.samed} where epid=#{p.epid} and studentid=#{p.studentid}
     </update>
+
+    <!--获取试卷中主观题-->
+    <select id="listQuestionZGT" resultType="com.xhkjedu.model.EPaperStudentQuestion">
+        select * from e_paper_student_question0608 where epid=#{epid} and studentid=#{studentid}
+    </select>
+
+    <!--获取学生试卷-->
+    <select id="getStuPaperInfo" resultType="com.xhkjedu.model.EPaperStudent">
+        select epid,epsid,studentid,classid,stupic,pagenum,batchid from e_paper_student0608 where epid=#{epid} and studentid=#{studentid} limit 1
+    </select>
+
+    <!--清空学生作答信息-->
+    <update id="clearPaperStu">
+        update e_paper_student set sstate=0,checked=0,checkid=null,stuscore=0,batchid=null,
+        stupic=null,pagenum=0,verified=0 where epid=#{epid} and studentid=#{studentid}
+    </update>
+    <!--清空学生作答信息-->
+    <update id="clearPaperStuQues">
+        update e_paper_student_question set answered=0,answertype=0,stuanswer=null,
+        converted=0,answertime=null,stuscore=0,checked=0,checkid=null,checktime=null,
+        good=0,bad=0 where epid=#{epid} and studentid=#{studentid}
+    </update>
 </mapper>