完善答题卡，base64调文件服务参数问题

sapi/src/main/java/com/xhkjedu/sapi/controller/scantron/ScantronController.java

@@ -90,16 +90,25 @@ public class ScantronController {
     public ResultVo add(@RequestBody TScantron scantron){
         N_Utils.validation(new Object[]{scantron.getCreateid(),"创建人id",1,scantron.getSchoolid(),"学校id",1,
                 scantron.getSubjectid(),"科目id",1,scantron.getSname(),"答题卡名称",2});
-        scantronService.save(scantron);
-        return new ResultVo(0,"保存成功");
+        try {
+            scantronService.save(scantron);
+            return new ResultVo(0,"保存成功");
+        }catch (Exception e){
+            return new ResultVo(1,"保存失败");
+        }
     }
 
     //答题卡-修改
     @PostMapping("/update")
     public ResultVo update(@RequestBody TScantron scantron){
         N_Utils.validation(new Object[]{scantron.getSid(),"答题卡id",1});
-        scantronService.update(scantron);
-        return new ResultVo(0,"保存成功");
+
+        try {
+            scantronService.update(scantron);
+            return new ResultVo(0,"保存成功");
+        }catch (Exception e){
+            return new ResultVo(1,"保存失败");
+        }
     }
 
     //答题卡-删除

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

@@ -2,7 +2,6 @@ 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;
@@ -22,7 +21,7 @@ public interface ScantronMapper extends TkMapper<TScantron> {
     int updateScantronPubliched(@Param("sid")int sid, @Param("publiched")int publiched);
 
     //获取答题卡所在学校区域信息
-    TSchool getSchoolCloudByScanid(@Param("sid")int sid);
+    String getSchoolCloud();
 
     //更改pdf地址
     Integer updatePdfpath(@Param("sid")int sid, @Param("pdfpath")String pdfpath);

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

@@ -1,16 +1,16 @@
 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 org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -36,7 +36,8 @@ public class ScantronService {
     }
 
     //答题卡-保存
-    public void save(TScantron tScantron){
+    @Transactional(rollbackFor = Exception.class)
+    public void save(TScantron tScantron) throws Exception{
         tScantron.setCreatetime(N_Utils.getSecondTimestamp());
         if(tScantron.getSlayout() > 1){
             tScantron.setPapertype(1);
@@ -45,20 +46,26 @@ public class ScantronService {
         }
         String base64Path = tScantron.getPdfpath();
         tScantron.setPdfpath(null);
-        scantronMapper.insertSelective(tScantron);
+        scantronMapper.insertUseGeneratedKeys(tScantron);
 
         Integer sid = tScantron.getId();
-        String pdfpath = saveScantronPdf(base64Path,sid,tScantron.getSlayout());
-        scantronMapper.updatePdfpath(sid,pdfpath);//更改转为路径的pdf地址
+        String pdfpath = saveScantronPdf(base64Path,sid,tScantron.getSlayout(),tScantron.getSchoolid());
+        if(N_Utils.isNotEmpty(pdfpath)){
+            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);
+    private String saveScantronPdf(String pdfpath,Integer sid,Integer column,Integer schoolid) throws Exception {
+        String cloudcode = scantronMapper.getSchoolCloud();
+
+        String pdfbase64 = URLEncoder.encode(pdfpath,"UTF-8");
+        String savefolder = cloudcode + "/" + schoolid + "/scantron/";
+        String params = "base64path=" + pdfbase64 + "&savefolder=" + savefolder + "&column=" + column + "&filename=" + sid;
+        String fileInfoStr = N_Utils.sendPost(ConfigKey.fileapi + "bs/topdf", params);
+        if(N_Utils.isEmpty(fileInfoStr)){
+            return "";
+        }
         ResultVo fileResult = JSON.parseObject(fileInfoStr, ResultVo.class);
         if (fileResult.getCode() == 0 && N_Utils.isNotEmpty(fileResult.getObj())) {
             return fileResult.getObj().toString();
@@ -68,7 +75,7 @@ public class ScantronService {
     }
 
     //答题卡-修改
-    public void update(TScantron tScantron){
+    public void update(TScantron tScantron) throws Exception{
         if(N_Utils.isTrueInteger(tScantron.getSlayout()) && tScantron.getSlayout() > 1){
             tScantron.setPapertype(1);
         }else{
@@ -76,9 +83,9 @@ public class ScantronService {
         }
 
         TScantron oldScantron = scantronMapper.selectByPrimaryKey(tScantron.getSid());
-        if(!oldScantron.getPdfpath().equals(tScantron.getPdfpath())){
+        if(N_Utils.isEmpty(oldScantron.getPdfpath()) || !oldScantron.getPdfpath().equals(tScantron.getPdfpath())){
             String base64Path = tScantron.getPdfpath();
-            String pdfpath = saveScantronPdf(base64Path,tScantron.getSid(),tScantron.getSlayout());
+            String pdfpath = saveScantronPdf(base64Path,tScantron.getSid(),tScantron.getSlayout(),oldScantron.getSchoolid());
             tScantron.setPdfpath(pdfpath);
         }
 

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

@@ -29,9 +29,8 @@
     </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 id="getSchoolCloud" resultType="java.lang.String">
+        select cloudcode from t_cloud order by cloudid limit 1
     </select>
 
     <!--更改pdf地址-->

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

@@ -290,6 +290,9 @@ public class MsScanbatchPaperService {
                         assert blockQuestion != null;
                         return q.getMptqid().equals(blockQuestion.getMptqid());
                     }).findFirst().orElse(null);
+                    if(queAnswer == null){
+                        throw new RuntimeException("学生试题信息有误");
+                    }
 
                     String identifycont = spbquestion.getIdentifycont();
 
@@ -444,8 +447,7 @@ public class MsScanbatchPaperService {
             if(hasstu){
                 //获取答案
                 MsPaperStudentQuestion stuQuestion = stuQuestions.stream().filter(q -> q.getMptqid().equals(spbquestion.getMptqid())).findFirst().orElse(null);
-                String stuanswer = stuQuestion.getStuanswer();
-                if(N_Utils.isNotEmpty(qidentify) && N_Utils.isNotEmpty(stuanswer) && !qidentify.equals(stuanswer)){
+                if(stuQuestion!=null &&N_Utils.isNotEmpty(qidentify) && N_Utils.isNotEmpty(stuQuestion.getStuanswer()) && !qidentify.equals(stuQuestion.getStuanswer())){
                     //如果识别结果和学生答案都不为空且不相等，则更改学生答案
                     stuQuestion.setStuanswer(qidentify);
                     checkObjectiveQuestion(stuQuestion);
@@ -477,8 +479,12 @@ public class MsScanbatchPaperService {
 
         List<MsScanbatch> batchList = msScanbatchPaperMapper.getScanErrorNum(mpid);
         MsScanbatch msScanbatch = batchList.stream().filter(b -> b.getBatchid().equals(batchid)).findFirst().orElse(null);
-        map.put("batchnum",msScanbatch.getScannum());
-        int totalnum = batchList.stream().mapToInt(b -> b.getScannum()).sum();
+        Integer batchnum = 0;
+        if(msScanbatch!= null){
+            batchnum = msScanbatch.getScannum();
+        }
+        map.put("batchnum",batchnum);
+        int totalnum = batchList.stream().mapToInt(MsScanbatch::getScannum).sum();
         map.put("totalnum",totalnum);
         return map;
     }

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

@@ -1,7 +1,6 @@
 package com.xhkjedu.smarking.service.scan;
 
 import com.xhkjedu.smarking.mapper.exam.MsClassMapper;
-import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchMapper;
 import com.xhkjedu.smarking.mapper.scan.MsScanbatchPaperMapper;
 import com.xhkjedu.smarking.model.exam.MsExam;
@@ -27,8 +26,6 @@ public class MsScanbatchService {
     @Resource
     private MsScanbatchMapper msScanbatchMapper;
     @Resource
-    private MsPaperMapper msPaperMapper;
-    @Resource
     private MsScanbatchPaperMapper msScanbatchPaperMapper;
     @Resource
     private MsClassMapper msClassMapper;

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

@@ -7,8 +7,10 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -277,22 +279,28 @@ public class MarkingUtil {
      * @Param [stupic, merged, saveFloder]
      * @Return java.lang.String
      **/
-    public static String uploadBase64Img(String stupic,Integer merged,String saveFloder){
+    public static 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";
         }
+        String stubase64;//防止内容被更改
+        try {
+            stubase64 = URLEncoder.encode(stupic, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            log.error("base64格式化内容出错" + e.getMessage());
+            throw new RuntimeException(e);
+        }
         //处理字段那种图片路径,base64转图片
-        params = params + "&savefolder=" + saveFloder;
+        String params = "base64path=" + stubase64 + "&savefolder=" + saveFloder;
         String fileInfoStr = N_Utils.sendPost(ConfigKey.fileapi + apiMethod, params);
+        if(N_Utils.isEmpty(fileInfoStr)){
+            return "";
+        }
         ResultVo fileResult = JSON.parseObject(fileInfoStr, ResultVo.class);
         if (fileResult.getCode() == 0 && N_Utils.isNotEmpty(fileResult.getObj())) {
             return fileResult.getObj().toString();