Эх сурвалжийг харах

采集端图片旋转-返回paperId

xiaof 4 жил өмнө
parent
commit
7f9e7da88f

+ 7 - 5
stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -240,7 +240,7 @@ public class CollectApi {
 
     @CrossOrigin(maxAge = 3600) //支持跨域
     @RequestMapping(value = "upload/student/{subjectId}", method = RequestMethod.POST)
-    public List<CollectStuDTO> saveStudent(HttpServletRequest request, @PathVariable Integer subjectId,
+    public CollectStuDTO saveStudent(HttpServletRequest request, @PathVariable Integer subjectId,
                                            CollectStuDTO dto) throws Exception {
         Subject subject = Subject.values()[subjectId - 1];
         Work activeWork = workRepo.findByActiveTrue();
@@ -248,8 +248,9 @@ public class CollectApi {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss");
 //        for (CollectStuDTO dto : uploadStudentArray) {
         Student student = studentRepo.findByWorkIdAndRelateExamNumberAndTest(activeWork.getId(), dto.getExamNumber(), String.valueOf(TrialEnum.DEFAULT.getId()));
+        Paper paper=null;
         if (!dto.isAbsent()) {
-            dataUploadService.savePaper(student, subject, dto.isManual(), dto.getLevel());
+            paper = dataUploadService.savePaper(student, subject, dto.isManual(), dto.getLevel());
         }
         //已知档位,更新阶段
         if (Objects.nonNull(dto.getLevel()) && dto.getLevel() != "") {
@@ -260,9 +261,10 @@ public class CollectApi {
             }
         }
         dto.setUploadTime(sdf.format(new Date()));
-        list.add(dto);
-//        }
-        return list;
+        if(paper != null){
+            dto.setPaperId(paper.getId());
+        }
+        return dto;
     }
 
 //    File srcFile = new File("/Users/king/stmms-ms/static/images/2/SM/1/1901040150.jpg"); //初始文件

+ 9 - 0
stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/dto/CollectStuDTO.java

@@ -16,6 +16,7 @@ public class CollectStuDTO {
     private String uploadTime;
 
     private String level;
+    private Long paperId;
 
     public Long getExamId() {
         return examId;
@@ -88,4 +89,12 @@ public class CollectStuDTO {
     public void setLevel(String level) {
         this.level = level;
     }
+
+    public Long getPaperId() {
+        return paperId;
+    }
+
+    public void setPaperId(Long paperId) {
+        this.paperId = paperId;
+    }
 }