Merge remote-tracking branch 'origin/wn' into ywx

smarking/src/main/java/com/xhkjedu/smarking/controller/paper/MsPaperController.java

@@ -4,8 +4,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.annotation.Action;
 import com.xhkjedu.smarking.model.exam.MsSubject;
+import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperBack;
+import com.xhkjedu.smarking.model.paper.MsPaperFile;
 import com.xhkjedu.smarking.service.paper.MsPaperService;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -76,4 +79,66 @@ public class MsPaperController {
         List<Map<String,Object>> list = msPaperService.listPaperBacksByEpid(paperBack.getMpid());
         return new ResultVo(0,"成功获取试卷退回原因",list);
     }
+
+    /*
+     * @Description 试卷试题-原卷试题及切割坐标
+     * @Date 2024/12/4 14:41:19
+     * @Author WN
+     * @Param [paperBack]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/que_coor")
+    public ResultVo listPaperQuestions(@RequestBody MsPaperBack paperBack){
+        N_Utils.validation(new Object[]{paperBack.getMpid(),"试卷id",1});
+        List<Map<String,Object>> list = msPaperService.listPaperQuestionCoors(paperBack.getMpid());
+        return new ResultVo(0,"成功获取试题",list);
+    }
+
+    /*
+     * @Description 试卷试题-保存切割
+     * @Date 2024/12/4 15:21:19
+     * @Author WN
+     * @Param [paperBack]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/que_cut")
+    public ResultVo updatePaperQuestionCoor(@RequestBody MsPaperParams params){
+        N_Utils.validation(new Object[]{params.getMpid(),"试卷id",1});
+        if(params.getQuestions() == null || params.getQuestions().size() == 0){
+            return new ResultVo(1,"未切割试题");
+        }
+        msPaperService.savePaperQuestionCoors(params);
+        return new ResultVo(0,"保存成功");
+    }
+
+    /*
+     * @Description 试卷文件-保存
+     * @Date 2024/10/17 16:01:07
+     * @Author WN
+     * @Param [paper]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/file_save")
+    public ResultVo savePaperFiles(@RequestBody MsPaper paper){
+        N_Utils.validation(new Object[]{paper.getMpid(),"试卷id",1});
+        List<MsPaperFile> pfiles = paper.getPfiles();
+        if(pfiles == null || pfiles.isEmpty()){
+            return new ResultVo(1,"未上传文件");
+        }
+        msPaperService.savePaperFiles(paper);
+        return new ResultVo(0,"保存成功");
+    }
+    /*
+     * @Description 试卷文件-删除
+     * @Date 2024/12/4 15:35:16
+     * @Author WN
+     * @Param [paper]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/file_del")
+    public ResultVo deletePaperFiles(@RequestBody MsPaper paper){
+        N_Utils.validation(new Object[]{paper.getMpid(),"试卷id",1});
+        msPaperService.deletePaperFiles(paper.getMpid());
+        return new ResultVo(0,"删除成功");
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/controller/paper/MsPaperQtypeController.java

@@ -98,24 +98,6 @@ public class MsPaperQtypeController {
         return new ResultVo(0,"保存成功");
     }
 
-    /*
-     * @Description 试卷文件
-     * @Date 2024/10/17 16:01:07
-     * @Author WN
-     * @Param [paper]
-     * @Return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/save_file")
-    public ResultVo savePaperFiles(@RequestBody MsPaper paper){
-        N_Utils.validation(new Object[]{paper.getMpid(),"试卷id",1});
-        List<MsPaperFile> pfiles = paper.getPfiles();
-        if(pfiles == null || pfiles.isEmpty()){
-            return new ResultVo(1,"未上传文件");
-        }
-        msPaperQtypeService.savePaperFiles(paper);
-        return new ResultVo(0,"保存成功");
-    }
-
     /*
      * @Description 试题知识点
      * @Date 2024/10/17 17:08:33

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsPaperMapper.java

@@ -67,4 +67,8 @@ public interface MsPaperMapper extends TkMapper<MsPaper> {
 
     //获取试卷类型
     Integer getPaperTypeByMpsid(@Param("mpsid") Integer mpsid);
+    //修改试卷切割状态
+    int updatePaperCutState(@Param("mpid") Integer mpid, @Param("cutstate") Integer cutstate);
+    //获取试卷切割状态
+    Integer getPaperCutStateByMpid(@Param("mpid") Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsPaperQtypeQuestionMapper.java

@@ -6,6 +6,7 @@ import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷试卷题型试题表 Mapper 接口
@@ -47,5 +48,11 @@ public interface MsPaperQtypeQuestionMapper extends TkMapper<MsPaperQtypeQuestio
     int getQuesnumByMptid(@Param("mptid")Integer mptid);
     //试题移动-获取要交换位置的试题
     MsPaperQtypeQuestion getQuestionForMoverOrder(@Param("p")MsPaperParams p);
+    //获取试卷中所有试题-页面展示
+    List<Map<String,Object>> listQuestionsForShow(@Param("mpid")Integer mpid);
+    //批量设置试题框选坐标
+    int updateBatchQuestionCoor(@Param("list") List<MsPaperQtypeQuestion> list);
+    //清空试题切割坐标
+    int updateQuestionCoorByMpid(@Param("mpid")Integer mpid);
 
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaper.java

@@ -43,6 +43,8 @@ public class MsPaper extends BaseBean {
     private Integer hearnum;
     //听力题文件地址(附件试卷）
     private String hearfile;
+    //原卷切割状态0未切割1已切割
+    private Integer cutstate;
     //创建人ID
     private Integer createid;
     //创建时间

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaperQtypeQuestion.java

@@ -49,6 +49,13 @@ public class MsPaperQtypeQuestion extends BaseBean {
     private Integer scoreset;
     //试题难易度
     private Integer complexity;
+    //第几张图
+    private Integer pagenum;
+    //题干区域坐标
+    private String stemcoor;
+    //试题区域坐标
+    private String quecoor;
+
 
     //试题知识点
     @Transient

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsExamService.java

@@ -107,6 +107,7 @@ public class MsExamService {
             p.setHasfile(0);
             p.setHearnum(0);
             p.setCorrecttype(0);
+            p.setCutstate(0);
             papers.add(p);
         }
         msSubjectMapper.insertList(subjects);//考试科目

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperService.java

@@ -3,15 +3,26 @@ package com.xhkjedu.smarking.service.paper;
 import com.xhkjedu.exception.MissingParametersException;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperBackMapper;
+import com.xhkjedu.smarking.mapper.paper.MsPaperFileMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
+import com.xhkjedu.smarking.mapper.paper.MsPaperQtypeQuestionMapper;
+import com.xhkjedu.smarking.mapper.system.SchoolMapper;
+import com.xhkjedu.smarking.model.paper.MsPaper;
 import com.xhkjedu.smarking.model.paper.MsPaperBack;
+import com.xhkjedu.smarking.model.paper.MsPaperFile;
+import com.xhkjedu.smarking.utils.MarkingUtil;
+import com.xhkjedu.smarking.vo.paper.MsPaperParams;
+import com.xhkjedu.smarking.vo.paper.PaperFileVo;
+import com.xhkjedu.smarking.vo.system.SchoolCloudVo;
 import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 阅卷试卷表 服务实现类
@@ -19,6 +30,7 @@ import java.util.Map;
  * @Date 2024-10-15
  */
 @Service
+@Slf4j
 public class MsPaperService {
     @Resource
     private MsPaperMapper msPaperMapper;
@@ -26,6 +38,12 @@ public class MsPaperService {
     private MsPaperBackMapper msPaperBackMapper;
     @Resource
     private MsSubjectMapper msSubjectMapper;
+    @Resource
+    private MsPaperQtypeQuestionMapper msPaperQtypeQuestionMapper;
+    @Resource
+    private MsPaperFileMapper msPaperFileMapper;
+    @Resource
+    private SchoolMapper schoolMapper;
 
     /*
      * @Description 列表--教师出卷
@@ -34,10 +52,10 @@ public class MsPaperService {
      * @Param [teacherid, esstate]
      * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      **/
-    public List<Map<String,Object>> listExamPapersByTeacherid(Integer teacherid, Integer pstate){
+    public List<Map<String, Object>> listExamPapersByTeacherid(Integer teacherid, Integer pstate) {
         int timestamp = N_Utils.getSecondTimestamp();
         String strtime = N_Utils.getStrtimeTimestamp(timestamp, "yyyy-MM-dd HH:mm:ss");
-        return msPaperMapper.listExamPapersByTeacherid(teacherid,pstate,strtime);
+        return msPaperMapper.listExamPapersByTeacherid(teacherid, pstate, strtime);
     }
 
     /*
@@ -50,12 +68,12 @@ public class MsPaperService {
     @Transactional(rollbackFor = Exception.class)
     public void savePaperBack(MsPaperBack paperBack) {
         Integer examstate = msPaperMapper.getExamStateByMpid(paperBack.getMpid());
-        if (examstate == 1 ) throw new MissingParametersException("考试已开始禁止操作");
-        if (examstate >= 2 ) throw new MissingParametersException("考试已结束禁止操作");
+        if (examstate == 1) throw new MissingParametersException("考试已开始禁止操作");
+        if (examstate >= 2) throw new MissingParametersException("考试已结束禁止操作");
         int timestamp = N_Utils.getSecondTimestamp();
         paperBack.setCreatetime(timestamp);
         msPaperBackMapper.insertUseGeneratedKeys(paperBack);
-        //更改试卷科目状态
+        // 更改试卷科目状态
         msSubjectMapper.updatePstateByMpid(paperBack.getMpid(), 3);
     }
 
@@ -66,13 +84,100 @@ public class MsPaperService {
      * @Param [mpid]
      * @Return java.util.List<java.util.Map>
      **/
-    public List<Map<String,Object>> listPaperBacksByEpid(Integer mpid){
+    public List<Map<String, Object>> listPaperBacksByEpid(Integer mpid) {
         return msPaperBackMapper.listPaperBacksByMpid(mpid);
     }
 
-    //获取考试ID
-    public Integer getExamidByMpid(Integer mpid){
+    // 获取考试ID
+    public Integer getExamidByMpid(Integer mpid) {
         return msPaperMapper.getExamidByMpid(mpid);
     }
 
+    /*
+     * @Description 试卷试题-获取试卷中所有试题题号及坐标
+     * @Date 2024/12/4 14:39:15
+     * @Author WN
+     * @Param [mpid]
+     * @Return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     **/
+    public List<Map<String, Object>> listPaperQuestionCoors(Integer mpid) {
+        return msPaperQtypeQuestionMapper.listQuestionsForShow(mpid);
+    }
+
+    /*
+     * @Description 试卷试题-保存切割
+     * @Date 2024/12/4 15:20:31
+     * @Author WN
+     * @Param [params]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void savePaperQuestionCoors(MsPaperParams params) {
+        // 保存试题切割信息
+        msPaperQtypeQuestionMapper.updateBatchQuestionCoor(params.getQuestions());
+        // 保存试卷切割状态
+        msPaperMapper.updatePaperCutState(params.getMpid(), 1);
+    }
+
+    /*
+     * @Description 试卷原卷-保存
+     * @Date 2024/10/17 16:00:37
+     * @Author WN
+     * @Param [paper]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void savePaperFiles(MsPaper paper) {
+        Integer mpid = paper.getMpid();
+        List<MsPaperFile> pfiles = paper.getPfiles();
+        // 删除已保存主观题答案图片
+        msPaperFileMapper.deleteByMpidAndType(mpid, 1);
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        PaperFileVo paperFileVo = null;
+        if (pfiles.get(0).getFilepath().contains("base64,")) {
+            List<String> base64list = pfiles.stream().map(MsPaperFile::getFilepath).collect(Collectors.toList());
+
+            SchoolCloudVo schoolCloudVo = schoolMapper.getSchoolCloudcode(mpid);
+            String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/paper/";
+            paperFileVo = MarkingUtil.uploadBatchBase64ImgPdf(base64list, saveFloder);
+        }
+
+        for (int i = 0; i < pfiles.size(); i++) {
+            MsPaperFile pf = pfiles.get(i);
+            pf.setMpid(mpid);
+            pf.setCreateid(paper.getCreateid());
+            pf.setCreatetime(timestamp);
+            pf.setFiletype(1);
+            pf.setFileorder(i + 1);
+            if (paperFileVo != null) {
+                pf.setSourcepath(paperFileVo.getPdfpath());
+                pf.setFilepath(paperFileVo.getImgs().get(i));
+            }
+        }
+        paper.setHasfile(1);
+        msPaperMapper.updateByPrimaryKeySelective(paper);
+        msPaperFileMapper.insertList(pfiles);
+    }
+
+
+    /*
+     * @Description 试卷原卷-删除
+     * @Date 2024/12/4 15:34:23
+     * @Author WN
+     * @Param [mpid]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void deletePaperFiles(Integer mpid) {
+        // 删除试卷文件
+        msPaperFileMapper.deleteByMpidAndType(mpid, 1);
+        // 获取试卷切割状态
+        Integer cutstate = msPaperMapper.getPaperCutStateByMpid(mpid);
+        if (N_Utils.isTrueInteger(cutstate)) {
+            // 说明试卷已切割，清除切割信息
+            msPaperMapper.updatePaperCutState(mpid, 0);// 保存试卷切割状态
+            msPaperQtypeQuestionMapper.updateQuestionCoorByMpid(mpid);// 清除试题切割信息
+        }
+    }
+
 }

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -3,6 +3,7 @@ package com.xhkjedu.smarking.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.xhkjedu.smarking.config.ConfigKey;
+import com.xhkjedu.smarking.vo.paper.PaperFileVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
@@ -310,21 +311,29 @@ public class MarkingUtil {
     }
 
     /*
-     * @Description 批量上传base64图片
+     * @Description 批量上传base64图片，返回图片地址及合并后地址(用于试卷上传)
      * @Date 2024/10/30 15:09:05
      * @Author WN
      * @Param [stupic, saveFloder]
      * @Return java.util.List<java.lang.String>
      **/
-    public static List<String> uploadBatchBase64Img(List<String> imgList,String saveFloder){
+    public static PaperFileVo uploadBatchBase64ImgPdf(List<String> imgList, String saveFloder){
         //处理字段那种图片路径,base64转图片
-        String params = "filepaths=" + imgList + "&savefolder=" + saveFloder;
-        String fileInfoStr = N_Utils.sendPost(ConfigKey.fileapi + "bs/mbase", params);
+        String base64path = JSON.toJSONString(imgList);
+        try {
+            base64path = URLEncoder.encode(base64path, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            log.error("试卷原卷base64格式化内容出错" + e.getMessage());
+            throw new RuntimeException(e);
+        }
+
+        String params = "base64path=" + base64path + "&savefolder=" + saveFloder + "&column=1";
+        String fileInfoStr = N_Utils.sendPost(ConfigKey.fileapi + "bs/more_pdf", params);
         ResultVo fileResult = JSON.parseObject(fileInfoStr, ResultVo.class);
         if (fileResult.getCode() == 0 && N_Utils.isNotEmpty(fileResult.getObj())) {
-            return JSONArray.parseArray(fileResult.getObj().toString(), String.class);
+            return JSONArray.parseObject(fileResult.getObj().toString(), PaperFileVo.class);
         }else{
-            return new ArrayList<>();
+            return null;
         }
     }
 

smarking/src/main/java/com/xhkjedu/smarking/vo/paper/MsPaperParams.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.smarking.vo.paper;
 
 import com.xhkjedu.smarking.model.paper.MsPaperBlock;
+import com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion;
 import com.xhkjedu.smarking.model.paper.MsTemplateBlock;
 import lombok.Data;
 
@@ -28,4 +29,6 @@ public class MsPaperParams {
 
     private Integer movetype;//移动类型1上移2下移
     private Integer movevalue;//移动值
+
+    private List<MsPaperQtypeQuestion> questions;//试题列表
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/paper/PaperFileVo.java

@@ -0,0 +1,18 @@
+package com.xhkjedu.smarking.vo.paper;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description：试卷文件
+ * @Author: WN
+ * @Date: 2024/12/4 16:12:35
+ **/
+@Data
+public class PaperFileVo {
+
+    private String pdfpath; //试卷pdf路径
+
+    private List<String> imgs; //试卷图片路径列表
+}

smarking/src/main/resources/application.properties

@@ -3,8 +3,8 @@ server.port=8090
 spring.application.name=smarking
 #\u6CE8\u518C\u5230\u6211\u4EEC\u672C\u5730\u7684eureka\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u7AEF\u53E38081
 eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@127.0.0.1:8081/eureka/
-eureka.client.register-with-eureka=true
-eureka.client.fetch-registry=true
+eureka.client.register-with-eureka=false
+eureka.client.fetch-registry=false
 #\u8BBE\u7F6Eeureka\u8F93\u51FA\u65E5\u5FD7\u7EA7\u522B
 logging.level.com.netflix=error
 

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -12,7 +12,7 @@
     <!--考试进度总览-->
     <select id="examOverview" resultType="java.util.Map">
         select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.msstate,s.pstate,s.ptstate,
-        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,s.teacherid,
+        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,p.cutstate,s.teacherid,
         u.username as teachername,p.mpid,p.hasfile,e.exammode,e.examstate,e.hashb,e.gradeid,s.leaderid,u2.username as leadername
         ,if(ps.batchid is not null,ps.mpsid,null) scannum,count(ps.mpsid) stunum
         from ms_subject s left join t_user u on s.teacherid=u.userid

smarking/src/main/resources/mapper/paper/MsPaperMapper.xml

@@ -117,4 +117,13 @@
     <select id="getPaperTypeByMpsid" resultType="java.lang.Integer">
         select p.ptype from ms_paper p left join ms_paper_student ps on p.mpid=ps.mpid where ps.mpsid=#{mpsid}
     </select>
+
+    <!--修改试卷切割状态-->
+    <update id="updatePaperCutState">
+        update ms_paper set cutstate=#{cutstate} where mpid=#{mpid}
+    </update>
+    <!--获取试卷切割状态-->
+    <select id="getPaperCutStateByMpid" resultType="java.lang.Integer">
+        select cutstate from ms_paper where mpid=#{mpid}
+    </select>
 </mapper>

smarking/src/main/resources/mapper/paper/MsPaperQtypeQuestionMapper.xml

@@ -64,7 +64,9 @@
 
     <!--试卷中所有试题基础信息-->
     <select id="listQuestionsByMpid" resultType="com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion">
-        select * from ms_paper_qtype_question where mpid=#{mpid} order by qorder
+        select q.* from ms_paper_qtype_question q
+        left join ms_paper_qtype t on q.mptid=t.mptid and q.mpid=t.mpid
+        where q.mpid=#{mpid} order by t.mptorder,q.qorder
     </select>
 
     <!--清空试题难易度-->
@@ -99,7 +101,7 @@
 
     <!--获取试卷中所有试题排序-->
     <select id="listQuesOrderByMpid" resultType="com.xhkjedu.smarking.model.paper.MsPaperQtypeQuestion">
-        select q.mptqid,q.qn,q.qorder from ms_paper_qtype_question q
+        select q.mptqid,q.qn,q.qorder,q.qscore from ms_paper_qtype_question q
         left join ms_paper_qtype t on q.mptid=t.mptid and q.mpid=t.mpid
         where q.mpid=#{mpid} order by t.mptorder,q.qorder
     </select>
@@ -114,4 +116,22 @@
         select mptqid,qorder from ms_paper_qtype_question where mpid=#{p.mpid} and qorder=(
                 (select qorder from ms_paper_qtype_question where mptqid=#{p.mptqid})+(#{p.movevalue}))
     </select>
+
+    <!--获取试卷中所有试题-页面展示-->
+    <select id="listQuestionsForShow" resultType="java.util.Map">
+        select q.mptqid,q.qn,q.qorder,q.qscore,q.pagenum,q.stemcoor,q.quecoor,t.mptqn,t.mptorder from ms_paper_qtype_question q
+        left join ms_paper_qtype t on q.mptid=t.mptid and q.mpid=t.mpid
+        where q.mpid=#{mpid} order by t.mptorder,q.qorder
+    </select>
+
+    <!--批量设置试题切割坐标-->
+    <update id="updateBatchQuestionCoor">
+        <foreach collection="list" item="q" separator=",">
+            update ms_paper_qtype_question set pagenum=#{q.pagenum},stemcoor=#{q.stemcoor},quecoor=#{q.quecoor} where mptqid=#{q.mptqid}
+        </foreach>
+    </update>
+    <!--清空试题切割坐标-->
+    <update id="updateQuestionCoorByMpid">
+        update ms_paper_qtype_question set pagenum=0,stemcoor=null,quecoor=null where mpid=#{mpid}
+    </update>
 </mapper>