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

gateway/src/main/resources/application.properties

@@ -129,7 +129,7 @@ whitelistAPI=/user/login,user/loginstu,/class_student/stu_class,/user/detail,/st
   ,/class_student/import_user,/user/import_teacher,/user/autologin\
   ,/get_new,/stype/list,/cloud/detail,/auser/import,/pdf,/epsb/import,\
   ,/section/get_zjr,/csw/add,/xz/import,/agora_token/rtc_token,/epqt/pqs,/eb/get_mn,/scan/save,/eps/sca,/eps/scaer\
-  ,/module/treelst,/std/td_num,/bk/list_client,/user/check_login
+  ,/module/treelst,/std/td_num,/bk/list_client,/user/check_login,/smarking/mscan/save,/smarking/mscanp/save,/smarking/mscanp/paper_temps
 
 #\u53C2\u6570\u5927\u5C0F\u9650\u523650M
 paramsize=52428800

smarking/src/main/java/com/xhkjedu/smarking/controller/scan/MsScanbatchPaperController.java

@@ -1,6 +1,5 @@
 package com.xhkjedu.smarking.controller.scan;
 
-import com.xhkjedu.smarking.model.paper.MsTemplate;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaper;
 import com.xhkjedu.smarking.model.scan.MsScanbatchPaperBlock;
 import com.xhkjedu.smarking.service.scan.MsScanbatchPaperService;
@@ -56,8 +55,7 @@ public class MsScanbatchPaperController {
     public ResultVo listTemplates(@RequestBody MsScanbatchPaper msScanbatchPaper) {
         Integer mpid = msScanbatchPaper.getMpid();
         N_Utils.validation(new Object[]{mpid, "试卷id", 1});
-        List<MsTemplate> temps = msScanbatchPaperService.listTemplates(mpid);
-        return new ResultVo(0, "获取成功", temps);
+        return new ResultVo(0, "获取成功", msScanbatchPaperService.listTemplates(mpid));
     }
 
     /*

smarking/src/main/java/com/xhkjedu/smarking/controller/stupaper/MsPaperStudentScoreController.java

@@ -173,11 +173,14 @@ public class MsPaperStudentScoreController {
     @PostMapping("/save_import")
     public ResultVo saveBatchForImport(MsPaperStudentScore stuScoreVo, MultipartFile file) {
         N_Utils.validation(new Object[]{stuScoreVo.getExamid(), "考试id", 1});
+        if(file == null){
+            return new ResultVo(1, "上传文件不能为空");
+        }
 
         try {
             return msPaperStudentScoreService.saveBatch(stuScoreVo, file);
         }catch (Exception e){
-            log.error("补录成绩导入失败", e.getMessage());
+            log.error("补录成绩导入失败" + e.getMessage());
             return new ResultVo(1, "保存失败");
         }
     }

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

@@ -30,7 +30,7 @@ public interface MsTemplateMapper extends TkMapper<MsTemplate> {
     int getUnSelTemplateCount(@Param("mpid")Integer mpid);
 
     //试卷所有模板信息
-    List<MsTemplate> listTemplateBlockQueByMpid(@Param("mpid") Integer mpid);
+    List<Map<String,Object>> listTemplateBlockQueByMpid(@Param("mpid") Integer mpid);
 
     //获取模版详情和考试id
     MsTemplate getTemplateAndExamidByMtid(@Param("mtid") Integer mtid);

smarking/src/main/java/com/xhkjedu/smarking/mapper/scan/MsScanbatchPaperMapper.java

@@ -44,8 +44,10 @@ public interface MsScanbatchPaperMapper extends TkMapper<MsScanbatchPaper> {
 
     //扫描异常-缺考异常-异常处理
     int updateBatchScanPaperMspstate(@Param("list") List<PaperStudentWebVo> list);
-    //获取重新识别数据
+    //重新识别-获取重新识别数据
     List<MsScanbatchPaper> listScanPapersForReidentify(@Param("param") ScanParams param);
-    //删除需要重新识别试卷识别数据
+    //重新识别-删除需要重新识别试卷识别数据
     int deleteScanPaperForReidentify(@Param("param") ScanParams param);
+    //重新识别-修改识别试卷数据
+    int updateScanPaperForReidentified(@Param("p")MsScanbatchPaper p);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/scan/MsScanbatchPaper.java

@@ -23,6 +23,8 @@ public class MsScanbatchPaper extends BaseBean {
     private Integer batchid;
     //当前批次第几张
     private Integer batchorder;
+    //试卷扫描图片
+    private String paperpic;
     //试卷正面
     private String paperfront;
     //试卷反面

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.smarking.service.scan;
 
+import com.alibaba.fastjson.JSON;
 import com.xhkjedu.exception.ServiceException;
 import com.xhkjedu.smarking.mapper.exam.MsExamMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperBlockQuestionMapper;
@@ -94,7 +95,7 @@ public class MsScanbatchPaperService {
     }
 
     //获取试卷的所有模版信息
-    public List<MsTemplate> listTemplates(Integer mpid){
+    public List<Map<String,Object>> listTemplates(Integer mpid){
         return msTemplateMapper.listTemplateBlockQueByMpid(mpid);
     }
 
@@ -184,17 +185,41 @@ public class MsScanbatchPaperService {
         SchoolCloudVo schoolCloudVo = schoolMapper.getSchoolCloudcode(msScanbatchPaper.getMpid());
         String saveFloder = schoolCloudVo.getCloudcode() + "/" + schoolCloudVo.getSchoolid() + "/marking/scan";
 
-        String paperfront = MarkingUtil.uploadBase64Img(msScanbatchPaper.getPaperfront(),1,saveFloder);
-        if(N_Utils.isNotEmpty(paperfront)){
-            msScanbatchPaper.setPaperfront(paperfront);
+        //扫描的图片
+        if(N_Utils.isNotEmpty(msScanbatchPaper.getPaperpic())){
+            List<String> paperpics = JSON.parseArray(msScanbatchPaper.getPaperpic(), String.class);
+            List<String> rtnPics = new ArrayList<>();
+            for(String pic : paperpics){
+                if(N_Utils.isNotEmpty(pic)){
+                    String paperpic = MarkingUtil.uploadBase64Img(pic,1,saveFloder);
+                    if(N_Utils.isNotEmpty(paperpic)){
+                        rtnPics.add(paperpic);
+                    }
+                }
+            }
+            if(!rtnPics.isEmpty()){
+                msScanbatchPaper.setPaperpic(JSON.toJSONString(rtnPics));
+            }
+        }
+
+        if(N_Utils.isNotEmpty(msScanbatchPaper.getPaperfront())){
+            String paperfront = MarkingUtil.uploadBase64Img(msScanbatchPaper.getPaperfront(),1,saveFloder);
+            if(N_Utils.isNotEmpty(paperfront)){
+                msScanbatchPaper.setPaperfront(paperfront);
+            }
         }
-        String paperback = MarkingUtil.uploadBase64Img(msScanbatchPaper.getPaperback(),1,saveFloder);
-        if(N_Utils.isNotEmpty(paperback)){
-            msScanbatchPaper.setPaperback(paperback);
+        if(N_Utils.isNotEmpty(msScanbatchPaper.getPaperback())){
+            String paperback = MarkingUtil.uploadBase64Img(msScanbatchPaper.getPaperback(),1,saveFloder);
+            if(N_Utils.isNotEmpty(paperback)){
+                msScanbatchPaper.setPaperback(paperback);
+            }
         }
-        String examnopic = MarkingUtil.uploadBase64Img(msScanbatchPaper.getExamnopic(),1,saveFloder);
-        if(N_Utils.isNotEmpty(examnopic)){
-            msScanbatchPaper.setExamnopic(examnopic);
+
+        if(N_Utils.isNotEmpty(msScanbatchPaper.getExamnopic())){
+            String examnopic = MarkingUtil.uploadBase64Img(msScanbatchPaper.getExamnopic(),1,saveFloder);
+            if(N_Utils.isNotEmpty(examnopic)){
+                msScanbatchPaper.setExamnopic(examnopic);
+            }
         }
 
         msScanbatchPaperMapper.insertUseGeneratedKeys(msScanbatchPaper);
@@ -650,7 +675,7 @@ public class MsScanbatchPaperService {
         if(scanbatchPapers.isEmpty()) return;
 
         //获取考试对应的试卷模板及坐标信息
-        List<MsTemplate> templates = msTemplateMapper.listTemplateBlockQueByMpid(mpid);
+        List<Map<String,Object>> templates = msTemplateMapper.listTemplateBlockQueByMpid(mpid);
         if(templates.isEmpty()) throw new ServiceException("该考试未设置试卷模板");
 
         //清空学生题块试题信息和学生试卷扫描识别信息
@@ -684,6 +709,10 @@ public class MsScanbatchPaperService {
         return template;
     }
 
+    //重新识别-获取试卷正反面图片
+    private void settPaperFrontAndBack(MsScanbatchPaper scanbatchPaper,MsTemplate template){
+
+    }
 
 
 }

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

@@ -13,11 +13,17 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
+import org.opencv.core.Mat;
+import org.opencv.core.MatOfByte;
+import org.opencv.imgcodecs.Imgcodecs;
 
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -350,6 +356,77 @@ public class MarkingUtil {
         }
     }
 
+    private static final String BOUNDARY = UUID.randomUUID().toString();
+
+    //上传Mat图片
+    public static String sendPostForMat(Mat matImage, String param) {
+        // 将 Mat 转换为字节数组
+        MatOfByte matOfByte = new MatOfByte();
+        Imgcodecs.imencode(".jpg", matImage, matOfByte);
+        byte[] byteArray = matOfByte.toArray();
+
+        // 是否重命名0不重名1重命名
+        Integer isrename = 1;
+        Integer iscompress = 1;//是否压缩0压缩1不压缩
+        BufferedOutputStream bufferedOutputStream = null;
+        BufferedReader bufferedReader = null;
+        String result = "";
+
+        try {
+            // 创建 URL 对象
+            URL url = new URL("http://127.0.0.1:8908/up/upfile");
+            // 打开连接
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            // 设置请求方法为 POST
+            connection.setRequestMethod("POST");
+            connection.setDoOutput(true);
+            // 生成唯一的边界字符串
+            String boundary = UUID.randomUUID().toString();
+            // 设置为 multipart/form-data 以便发送多部分数据
+            connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
+
+            // 获取输出流
+            OutputStream outputStream = connection.getOutputStream();
+            bufferedOutputStream = new BufferedOutputStream(outputStream);
+
+            // 写入图片数据
+            bufferedOutputStream.write(("--" + boundary + "\r\n" +
+                    "Content-Disposition: form-data; name=\"file\"; filename=\"image.jpg\"\r\n" +
+                    "Content-Type: image/jpeg\r\n\r\n").getBytes(StandardCharsets.UTF_8));
+            bufferedOutputStream.write(byteArray);
+            bufferedOutputStream.write(("\r\n--" + boundary + "\r\n" +
+                    "Content-Disposition: form-data; name=\"savefolder\"\r\n\r\n" + param +
+                    "\r\n--" + boundary + "\r\n" +
+                    "Content-Disposition: form-data; name=\"isrename\"\r\n\r\n" + isrename +
+                    "\r\n--" + boundary + "\r\n" +
+                    "Content-Disposition: form-data; name=\"iscompress\"\r\n\r\n" + iscompress +
+                    "\r\n--" + boundary + "--\r\n").getBytes(StandardCharsets.UTF_8));
+
+            bufferedOutputStream.flush();
+            bufferedOutputStream.close();
+
+            bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = bufferedReader.readLine())!= null) {
+                result += line;
+            }
+        } catch (Exception e) {
+            log.error("发送 POST 请求出现异常！" + e.getMessage());
+        }finally {
+            try {
+                if(bufferedOutputStream!= null){
+                    bufferedOutputStream.close();
+                }
+                if (bufferedReader != null) {
+                    bufferedReader.close();
+                }
+            } catch (IOException ex) {
+                log.error("关闭输入输出流异常", ex.getMessage());
+            }
+        }
+        return result;
+    }
+
     /*
      * @Description 识别客观题题块单题结果
      * @Date 2024/11/7 14:58:44

smarking/src/main/java/com/xhkjedu/smarking/utils/opencv/CvCommonUtils.java

@@ -8,6 +8,14 @@ import java.util.Base64;
 import java.util.List;
 
 public class CvCommonUtils {
+
+    static {
+        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+        String libraryPath = System.getProperty("java.library.path");
+        // 输出java.library.path的值，用于查看当前系统的库搜索路径。
+        System.out.println("java.library.path：" + libraryPath);
+    }
+
     /**
      * 逆时针旋转90度
      *

smarking/src/main/java/com/xhkjedu/smarking/utils/opencv/TestMain.java

@@ -0,0 +1,33 @@
+package com.xhkjedu.smarking.utils.opencv;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.smarking.utils.MarkingUtil;
+import com.xhkjedu.vo.ResultVo;
+import org.opencv.core.Core;
+import org.opencv.core.Mat;
+import org.opencv.imgcodecs.Imgcodecs;
+
+/**
+ * @Description：
+ * @Author: WN
+ * @Date: 2025/1/10 14:56:28
+ **/
+public class TestMain {
+    static {
+        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+    }
+    public static void main(String[] args) {
+
+        // String libraryPath = System.getProperty("java.library.path");
+        // // 输出java.library.path的值，用于查看当前系统的库搜索路径。
+        // System.out.println("java.library.path：" + libraryPath);
+
+
+        String imgPath= "D:\\school\\images\\tr2.jpg";
+        String param = "AAA/0110";
+        Mat img =  Imgcodecs.imread(imgPath, Imgcodecs.IMREAD_GRAYSCALE);
+        String resultVo = MarkingUtil.sendPostForMat(img, param);
+        ResultVo result = JSON.parseObject(resultVo, ResultVo.class);
+        System.out.println(result.getObj());
+    }
+}

smarking/src/main/resources/application.properties

@@ -93,7 +93,11 @@ cron.questionCheckState=0 0/10 * * * ?
 marking.socket=wss://wsexam.xhkjedu.com/ws
 marking.face=https://face.xhkjedu.com/
 #\u6587\u4EF6\u670D\u52A1\u5730\u5740
-fileapi=https://schoolfiletest.xhkjedu.com/
+#fileapi=https://schoolfiletest.xhkjedu.com/
+fileapi=http://127.0.0.1:8908/
+#\u6587\u4EF6\u670D\u52A1\u8BBF\u95EE\u6587\u4EF6\u5730\u5740
+file.showurl=http://schoolstatictest.xhkjedu.com/static/
+
 
 #\u914D\u7F6E\u8003\u8BD5\u7ED3\u675F\u65F6\u95F4\u8303\u56F4
 marking.endtime=30

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

@@ -51,7 +51,7 @@
     </select>
 
     <!--试卷所有模板信息-->
-    <resultMap id="paperTemplate" type="com.xhkjedu.smarking.model.paper.MsTemplate">
+    <resultMap id="paperTemplate" type="java.util.Map">
         <result property="mtid" column="mtid"/>
         <result property="mpid" column="mpid"/>
         <result property="tsize" column="tsize"/>
@@ -68,16 +68,15 @@
         <result property="violatecoor" column="violatecoor"/>
         <result property="examnocoor" column="examnocoor"/>
         <result property="cardcoor" column="cardcoor"/>
-        <collection property="tblocks" ofType="com.xhkjedu.smarking.model.paper.MsTemplateBlock" javaType="java.util.ArrayList">
+        <collection property="tblocks" ofType="java.util.Map" javaType="java.util.ArrayList">
             <result property="mtbid" column="mtbid"/>
             <result property="mblockid" column="mblockid"/>
             <result property="mttype" column="mttype"/>
             <result property="mtborder" column="mtborder"/>
             <result property="localcoor" column="localcoor"/>
-            <result property="pagenum" column="pagenum"/>
             <result property="extendcoor" column="extendcoor"/>
             <result property="scorecoor" column="scorecoor"/>
-            <collection property="tbquestions" ofType="com.xhkjedu.smarking.model.paper.MsTemplateBlockQuestion" javaType="java.util.ArrayList">
+            <collection property="tbquestions" ofType="java.util.Map" javaType="java.util.ArrayList">
                 <result property="mtbqid" column="mtbqid"/>
                 <result property="qn" column="qn"/>
                 <result property="mptqid" column="mptqid"/>
@@ -89,7 +88,7 @@
     <select id="listTemplateBlockQueByMpid" resultMap="paperTemplate">
         select t.mtid,t.mpid,t.tsize,t.twidth,t.theight,t.blankindex,t.anglefront,t.angleback,t.coorfront,t.coorback,
         t.dwtfront,t.dwtback,t.misscoor,t.violatecoor,t.examnocoor,t.cardcoor
-        ,tb.mtbid,tb.mblockid,tb.mttype,tb.mtborder,tb.localcoor,tb.pagenum,tb.extendcoor,tb.scorecoor
+        ,tb.mtbid,tb.mblockid,tb.mttype,tb.mtborder,tb.localcoor,tb.extendcoor,tb.scorecoor
         ,q.mtbqid,q.qn,q.mptqid,q.qlocalcoor,q.mtbqorder
         from ms_template t left join ms_template_block tb on t.mtid=tb.mtid
         left join ms_template_block_question q on tb.mtbid=q.mtbid

smarking/src/main/resources/mapper/scan/MsScanbatchPaperMapper.xml

@@ -71,7 +71,7 @@
         </foreach>
     </update>
 
-    <!--获取重新识别数据-->
+    <!--重新识别-获取重新识别数据-->
     <select id="listScanPapersForReidentify" resultType="com.xhkjedu.smarking.model.scan.MsScanbatchPaper">
         select * from ms_scanbatch_paper where mpid=#{param.mpid}
         <if test="param.batchid!=null and param.batchid!=0"> and batchid=#{param.batchid}</if>
@@ -79,7 +79,7 @@
         <if test="param.hasidentify!=null and param.hasidentify==2"> and identified=0</if>
         order by mspid
     </select>
-    <!--删除需要重新识别试卷识别数据-->
+    <!--重新识别-删除需要重新识别试卷识别数据-->
     <delete id="deleteScanPaperForReidentify">
         delete b from ms_scanbatch_paper_block b left join ms_scanbatch_paper p on b.mspid=p.mspid
         where p.mpid=#{param.mpid}
@@ -88,4 +88,11 @@
         <if test="param.hasidentify!=null and param.hasidentify==2"> and p.identified=0</if>
     </delete>
 
+    <!--重新识别-修改识别试卷数据-->
+    <update id="updateScanPaperForReidentified">
+        update ms_scanbatch_paper set paperfront=#{p.paperfront},paperback=#{p.paperback},identified=#{p.identified},examno=#{p.examno},
+        examnopic=#{p.examnopic},missexam=#{p.missexam},violated=#{p.violated},haserror=#{p.haserror},errortype=#{p.errortype},mspstate=#{p.mspstate}
+        where mspid=#{p.mspid}
+    </update>
+
 </mapper>

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

@@ -75,4 +75,11 @@ public class ConfigKey {
     public void setIpregiondb(String ipregiondb){
         ConfigKey.ipregiondb = ipregiondb;
     }
+
+    public static String fileShowurl;//解析ip地址归属地
+
+    @Value("${file.showurl}")
+    public void setFileShowurl(String fileShowurl){
+        ConfigKey.fileShowurl = fileShowurl;
+    }
 }