扫描答题卡时直接上传base64

答题卡模块转pdf

sapi/src/main/java/com/xhkjedu/sapi/mapper/scantron/ScantronMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sapi.mapper.scantron;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.sapi.model.scantron.TScantron;
+import com.xhkjedu.sapi.model.system.TSchool;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,4 +21,9 @@ public interface ScantronMapper extends TkMapper<TScantron> {
     //修改答题卡公开状态
     int updateScantronPubliched(@Param("sid")int sid, @Param("publiched")int publiched);
 
+    //获取答题卡所在学校区域信息
+    TSchool getSchoolCloudByScanid(@Param("sid")int sid);
+
+    //更改pdf地址
+    Integer updatePdfpath(@Param("sid")int sid, @Param("pdfpath")String pdfpath);
 }

sapi/src/main/java/com/xhkjedu/sapi/service/scantron/ScantronService.java

@@ -1,8 +1,13 @@
 package com.xhkjedu.sapi.service.scantron;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.xhkjedu.sapi.config.ConfigKey;
 import com.xhkjedu.sapi.mapper.scantron.ScantronMapper;
 import com.xhkjedu.sapi.model.scantron.TScantron;
+import com.xhkjedu.sapi.model.system.TSchool;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,8 +43,30 @@ public class ScantronService {
         }else{
             tScantron.setPapertype(2);
         }
+        String base64Path = tScantron.getPdfpath();
+        tScantron.setPdfpath(null);
         scantronMapper.insertSelective(tScantron);
+
+        Integer sid = tScantron.getId();
+        String pdfpath = saveScantronPdf(base64Path,sid,tScantron.getSlayout());
+        scantronMapper.updatePdfpath(sid,pdfpath);//更改转为路径的pdf地址
+    }
+
+    //答题卡-保存pdf
+    private String saveScantronPdf(String pdfpath,Integer sid,Integer column){
+        TSchool school = scantronMapper.getSchoolCloudByScanid(sid);
+        List<String> imgList = JSONArray.parseArray(pdfpath, String.class);
+        String savefloder = school.getCloudcode() + "/" + school.getSchoolid() + "/scantron/";
+        String params = "filepaths=" + imgList + "&savefloder=" + savefloder + "&column=" + column + "&filename=" + sid;
+        String fileInfoStr = N_Utils.sendPost(ConfigKey.fileapi + "ba/topdf", params);
+        ResultVo fileResult = JSON.parseObject(fileInfoStr, ResultVo.class);
+        if (fileResult.getCode() == 0 && N_Utils.isNotEmpty(fileResult.getObj())) {
+            return fileResult.getObj().toString();
+        }else{
+            return "";
+        }
     }
+
     //答题卡-修改
     public void update(TScantron tScantron){
         if(N_Utils.isTrueInteger(tScantron.getSlayout()) && tScantron.getSlayout() > 1){
@@ -47,6 +74,14 @@ public class ScantronService {
         }else{
             tScantron.setPapertype(2);
         }
+
+        TScantron oldScantron = scantronMapper.selectByPrimaryKey(tScantron.getSid());
+        if(!oldScantron.getPdfpath().equals(tScantron.getPdfpath())){
+            String base64Path = tScantron.getPdfpath();
+            String pdfpath = saveScantronPdf(base64Path,tScantron.getSid(),tScantron.getSlayout());
+            tScantron.setPdfpath(pdfpath);
+        }
+
         scantronMapper.updateByPrimaryKeySelective(tScantron);
     }
 

sapi/src/main/resources/mapper/scantron/ScantronMapper.xml

@@ -27,4 +27,16 @@
     <update id="updateScantronPubliched">
         update t_scantron set publiched=#{publiched} where sid=#{sid}
     </update>
+
+    <!--获取答题卡所在学校区域信息-->
+    <select id="getSchoolCloudByScanid" resultType="com.xhkjedu.sapi.model.system.TSchool">
+        select schoolid,(select cloudcode from t_cloud order by cloudid limit 1) cloudcode
+        from t_scantron where sid=#{sid}
+    </select>
+
+    <!--更改pdf地址-->
+    <update id="updatePdfpath">
+        update t_scantron set pdfpath=#{pdfpath} where sid=#{sid}
+    </update>
+
 </mapper>

smarking/src/main/java/com/xhkjedu/smarking/config/ConfigKey.java

@@ -53,4 +53,10 @@ public class ConfigKey {
         //Spring Boot注解读取application.properties或者application-{profile}.properties文件时默认的是ISO_8859_1编码,中文会乱码
         ConfigKey.signName = new String(signName.getBytes("ISO_8859_1"),"UTF-8");
     }
+
+    public static String fileapi;//文件服务地址
+    @Value("${fileapi}")
+    public void setFileapi(String fileapi) {
+        ConfigKey.fileapi = fileapi;
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/listener/MessageConsumer.java

@@ -1,16 +1,27 @@
 package com.xhkjedu.smarking.listener;
 
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
+import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestion;
 import com.xhkjedu.smarking.utils.ConvertUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
 /**
  * 消息到达消费者监听类
  */
 @Component
 @Slf4j
 public class MessageConsumer {
+    @Resource
+    private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
 
 
     @Autowired
@@ -18,29 +29,29 @@ public class MessageConsumer {
 
 
     /*
-     * @Description 学生题块、试题答案图片合并完处理转换状态
+     * @Description 学生试题答案图片合并完处理转换状态
      * @Date 2024/10/29 14:43:39
      * @Author WN
      * @Param [message]
      * @Return void
      **/
-    // @RabbitHandler
-    // @RabbitListener(queues = "${rabbitmq.markingImgMergeHandleQueue}")
-    // public void imgMergeHandleQueue(Message message) {
-    //     try {
-    //         String msg = new String(message.getBody(), "UTF-8");
-    //         System.out.println(LocalDateTime.now() + "学生题块、试题答案合并接收消息内容：" + msg);
-    //         EPaperStudentQuestion psq = JSON.parseObject(msg, EPaperStudentQuestion.class);
-    //         if (psq.getConverted() != 1) {//合并失败不修改学生答案
-    //             psq.setStuanswer(null);
-    //         } else {
-    //             psq.setStuanswer(JSON.toJSONString(new String[]{psq.getStuanswer()}));
-    //         }
-    //         ePaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
-    //     } catch (Exception e) {
-    //         log.error("学生试题答案合并失败：" + e.getMessage());
-    //     }
-    // }
+    @RabbitHandler
+    @RabbitListener(queues = "${rabbitmq.markingImgMergeHandleQueue}")
+    public void imgMergeHandleQueue(Message message) {
+        try {
+            String msg = new String(message.getBody(), "UTF-8");
+            System.out.println(LocalDateTime.now() + "学生试题答案合并接收消息内容：" + msg);
+            MsPaperStudentQuestion psq = JSON.parseObject(msg, MsPaperStudentQuestion.class);
+            if (psq.getConverted() != 1) {//合并失败不修改学生答案
+                psq.setStuanswer(null);
+            } else {
+                psq.setStuanswer(JSON.toJSONString(new String[]{psq.getStuanswer()}));
+            }
+            msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
+        } catch (Exception e) {
+            log.error("学生试题答案合并失败：" + e.getMessage());
+        }
+    }
 
     /**
      * @Description 修改试卷答题卡pdf
@@ -85,7 +96,7 @@ public class MessageConsumer {
     // }
 
     /**
-     * @Description 考试附件试卷图片转pdf
+     * @Description 阅卷附件试卷图片转pdf
      * @Param [message]
      * @Return void
      * @Author wn
@@ -96,13 +107,13 @@ public class MessageConsumer {
     // public void examImageToPdfHandleQueue(Message message) {
     //     try {
     //         String msg = new String(message.getBody(), "UTF-8");
-    //         System.out.println(LocalDateTime.now() + "考试附件试卷图片转pdf接收消息内容：" + msg);
+    //         System.out.println(LocalDateTime.now() + "阅卷附件试卷图片转pdf接收消息内容：" + msg);
     //         EPaperFile paperFile = JSON.parseObject(msg, EPaperFile.class);
     //         if (paperFile.getConverted() != null && paperFile.getConverted() == 1) {
     //             ePaperFileMapper.updateSourcepathByEpid(paperFile.getEpid(),paperFile.getSourcepath());
     //         }
     //     } catch (Exception e) {
-    //         log.error("考试附件试卷图片转pdf失败：" + e.getMessage());
+    //         log.error("阅卷附件试卷图片转pdf失败：" + e.getMessage());
     //     }
     // }
 
@@ -111,15 +122,15 @@ public class MessageConsumer {
     // public void examHtmlToPdfHandleQueue(Message message) {
     //     try {
     //         String msg = new String(message.getBody(), "UTF-8");
-    //         System.out.println(LocalDateTime.now() + "考试报告html转pdf接收消息内容：" + msg);
+    //         System.out.println(LocalDateTime.now() + "阅卷报告html转pdf接收消息内容：" + msg);
     //         EReportVo report = JSON.parseObject(msg, EReportVo.class);
     //         if (report.getConverted() != null && report.getConverted() != 1) return;
-    //         eReportGenerateMapper.updatePdf(report);//修改考试pdf地址
+    //         eReportGenerateMapper.updatePdf(report);//修改阅卷pdf地址
     //         Integer examid = report.getExamid();
     //         Integer type = report.getType();
     //         if (3 == type) {
     //             Integer classid = report.getClassid();
-    //             Integer num = eReportGenerateMapper.getNoPdfNumByExamAndClassId(examid, classid);//考试班级未生成pdf的数量
+    //             Integer num = eReportGenerateMapper.getNoPdfNumByExamAndClassId(examid, classid);//阅卷班级未生成pdf的数量
     //             if (0 == num) {
     //                 Map map = new HashMap();
     //                 String savefolder = eReportGenerateMapper.getSaveFolder(examid);
@@ -130,13 +141,13 @@ public class MessageConsumer {
     //                 convertUtil.htmlToPdf(map);
     //             }
     //         } else if (4 == type) {
-    //             Integer num = eReportGenerateMapper.getNoPdfNumByExamId(examid);//考试未生成pdf的数量
+    //             Integer num = eReportGenerateMapper.getNoPdfNumByExamId(examid);//阅卷未生成pdf的数量
     //             if (0 == num) {
     //                 eBaseMapper.updateExamReportState(examid, 2);
     //             }
     //         }
     //     } catch (Exception e) {
-    //         log.error("考试报告html转pdf失败：" + e.getMessage());
+    //         log.error("阅卷报告html转pdf失败：" + e.getMessage());
     //     }
     // }
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/system/SchoolMapper.java

@@ -1,5 +1,8 @@
 package com.xhkjedu.smarking.mapper.system;
 
+import com.xhkjedu.smarking.vo.system.SchoolCloudVo;
+import org.apache.ibatis.annotations.Param;
+
 public interface SchoolMapper {
 
     //获取学校当前年份
@@ -7,4 +10,7 @@ public interface SchoolMapper {
 
     //获取用户当前年份
     Integer getYearByUserId(Integer userid);
+
+    //获取考试对应区域码和学校id
+    SchoolCloudVo getSchoolCloudcode(@Param("mpid")Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchPaperService.java

@@ -1,6 +1,8 @@
 package com.xhkjedu.smarking.service.scan;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.xhkjedu.smarking.config.ConfigKey;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperBlockMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperBlockQuestionMapper;
@@ -8,6 +10,7 @@ import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMergeMapper;
+import com.xhkjedu.smarking.mapper.system.SchoolMapper;
 import com.xhkjedu.smarking.mapper.system.UserMapper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
@@ -17,7 +20,9 @@ import com.xhkjedu.smarking.model.stupaper.MsPaperStudentBlock;
 import com.xhkjedu.smarking.model.stupaper.MsPaperStudentQuestionMerge;
 import com.xhkjedu.smarking.utils.ConvertUtil;
 import com.xhkjedu.smarking.utils.MarkingUtil;
+import com.xhkjedu.smarking.vo.system.SchoolCloudVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,6 +56,8 @@ public class MsScanbatchPaperService {
     private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
     @Resource
     private ConvertUtil convertUtil;
+    @Resource
+    private SchoolMapper schoolMapper;
 
     /**
      * @Description 新增
@@ -113,7 +120,6 @@ public class MsScanbatchPaperService {
             return;
         }
 
-
         //保存扫描信息
         savePaperBlockQuestions(msScanbatchPaper);
         //学生试卷信息
@@ -129,6 +135,23 @@ public class MsScanbatchPaperService {
 
     //保存扫描试卷-保存扫描题块试题信息
     private void savePaperBlockQuestions(MsScanbatchPaper msScanbatchPaper){
+        //获取学校对应区域码，
+        SchoolCloudVo schoolCloudVo = schoolMapper.getSchoolCloudcode(msScanbatchPaper.getMpid());
+        String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/";
+
+        String paperfront = uploadBase64Img(msScanbatchPaper.getPaperfront(),1,saveFloder);
+        if(N_Utils.isNotEmpty(paperfront)){
+            msScanbatchPaper.setPaperfront(paperfront);
+        }
+        String paperback = uploadBase64Img(msScanbatchPaper.getPaperback(),1,saveFloder);
+        if(N_Utils.isNotEmpty(paperback)){
+            msScanbatchPaper.setPaperback(paperback);
+        }
+        String examnopic = uploadBase64Img(msScanbatchPaper.getExamnopic(),1,saveFloder);
+        if(N_Utils.isNotEmpty(examnopic)){
+            msScanbatchPaper.setExamnopic(examnopic);
+        }
+
         msScanbatchPaperMapper.insertUseGeneratedKeys(msScanbatchPaper);
         Integer mspid = msScanbatchPaper.getId();
         msScanbatchPaper.setMspid(mspid);
@@ -138,6 +161,14 @@ public class MsScanbatchPaperService {
         for (MsScanbatchPaperBlock spblock : spblocks) {
             spblock.setMspid(mspid);
             spblock.setBatchid(msScanbatchPaper.getBatchid());
+
+            //题块多图片合并比一张图片
+            String rtnBlock = uploadBase64Img(spblock.getPicpath(),2,saveFloder);
+            spblock.setPicpath(rtnBlock);
+
+            //题块多图片合并比一张图片
+            String extendBlock = uploadBase64Img(spblock.getExtendpath(),2,saveFloder);
+            spblock.setExtendpath(extendBlock);
         }
 
         msScanbatchPaperBlockMapper.insertList(spblocks);
@@ -155,7 +186,31 @@ public class MsScanbatchPaperService {
         }
         //更改识别数量
         msScanbatchMapper.updateIdentifynum(msScanbatchPaper.getBatchid());
+    }
 
+    //图片base上传
+    private String uploadBase64Img(String stupic,Integer merged,String saveFloder){
+        String apiMethod = "";
+        String params = "";
+        if(merged == 1){
+            //说明上传的图片为单张保存
+            params = "base64path=" + stupic;
+            apiMethod = "bs/base";
+        }else{
+            //上传的多张图片需要合并为一张
+            List<String> imgList =JSONArray.parseArray(stupic, String.class);
+            params = "filepaths=" + imgList;
+            apiMethod = "bs/mbase_merge";
+        }
+        //处理字段那种图片路径,base64转图片
+        params = params + "&savefolder=" + saveFloder + "marking/scan/";
+        String fileInfoStr = N_Utils.sendPost(ConfigKey.fileapi + apiMethod, params);
+        ResultVo fileResult = JSON.parseObject(fileInfoStr, ResultVo.class);
+        if (fileResult.getCode() == 0 && N_Utils.isNotEmpty(fileResult.getObj())) {
+            return fileResult.getObj().toString();
+        }else{
+            return "";
+        }
     }
 
     //保存扫描试卷-清空学生试卷题块试题信息
@@ -199,7 +254,6 @@ public class MsScanbatchPaperService {
         Double stuPaperScore = 0.0;//学生试卷得分
         List<MsPaperStudentBlock>  saveBlockList = new ArrayList<>();// 保存学生题块信息
         List<MsPaperStudentQuestionMerge> saveQuesList = new ArrayList<>();//保存学生提交试题
-        List<MsPaperStudentBlock> needConvertList = new ArrayList<>();//需要合并图片的题块
         Integer timestamp = N_Utils.getSecondTimestamp();
 
         for(MsScanbatchPaperBlock spblock : spblocks){
@@ -213,7 +267,6 @@ public class MsScanbatchPaperService {
             }
             studentBlock.setConverted(0);
             saveBlockList.add(studentBlock);
-            needConvertList.add(studentBlock);
 
             List<MsPaperStudentQuestionMerge> stuQuestions = studentBlock.getQuestions();//学生试题
             List<MsScanbatchPaperBlockQuestion> spbquestions = spblock.getSpbquestions();//扫描题块下试题
@@ -288,26 +341,12 @@ public class MsScanbatchPaperService {
         msPaperStudentBlockMapper.updateBatchStuBlock(saveBlockList);
         msPaperStudentQuestionMergeMapper.updateBatchStuQues(saveQuesList);
         msPaperStudentMapper.updateByPrimaryKeySelective(msPaperStudent);
-        handleStudentNeedConvert(needConvertList);
 
         rtnanswernum = saveQuesList.size();
 
         return rtnanswernum;
     }
 
-    private void handleStudentNeedConvert(List<MsPaperStudentBlock> needConvertList){
-        if(needConvertList.size() > 0){
-            for(MsPaperStudentBlock studentBlock : needConvertList){
-                String stuAnswer = studentBlock.getStuanswer();
-                List<String> stuPicList = JSON.parseArray(stuAnswer, String.class);
-                if(stuPicList != null && stuPicList.size() > 1){
-                    convertUtil.imgMerge(studentBlock.getMpsbid(),stuPicList,2);
-                }
-            }
-        }
-    }
-
-
     /*
      * @Description 扫描记录-查看原卷
      * @Date 2024/10/25 17:22:45

smarking/src/main/java/com/xhkjedu/smarking/vo/system/SchoolCloudVo.java

@@ -0,0 +1,15 @@
+package com.xhkjedu.smarking.vo.system;
+
+import lombok.Data;
+
+/**
+ * @Description：学校区域信息
+ * @Author: WN
+ * @Date: 2024/10/29 16:00:08
+ **/
+@Data
+public class SchoolCloudVo {
+    private Integer schoolid;
+
+    private String cloudcode;
+}

smarking/src/main/resources/application.properties

@@ -92,6 +92,10 @@ cron.deleteUriMap=0/3 * * * * ?
 #\u89E3\u6790ip\u5F52\u5C5E\u5730\u6570\u636E
 ipregiondb=D:\\school\\ip2region.xdb
 
+#\u6587\u4EF6\u670D\u52A1\u5730\u5740
+fileapi=https://schoolfiletest.xhkjedu.com/
+
+
 #\u7248\u672C\u53F7
 buildnum=301
 versionname=Test_v3.14.1

smarking/src/main/resources/mapper/system/SchoolMapper.xml

@@ -10,4 +10,10 @@
         select s.year from t_user u left join t_school s on u.schoolid=s.schoolid
         where u.userid=#{userid}
     </select>
+
+    <!--获取考试对应区域码和学校id-->
+    <select id="getSchoolCloudcode" resultType="com.xhkjedu.smarking.vo.system.SchoolCloudVo">
+        select e.schoolid,(select cloudcode from t_cloud order by cloudid limit 1) cloudcode from ms_paper p left join ms_exam e on p.examid=p.examid
+        where p.mpid=#{mpid}
+    </select>
 </mapper>