试卷结构上传-同步优化

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DataSyncServiceImpl.java

@@ -265,7 +265,7 @@ public class DataSyncServiceImpl implements DataSyncService {
                     syncStructureData.setAnswer(m.getAnswer());
                     return syncStructureData;
                 }).collect(Collectors.toList());
-                boolean syncObjectiveStructure = stmmsUtils.syncPaperStructure(examPaperStructure.getSchoolId(), String.valueOf(examPaperStructure.getThirdRelateId()), examPaperStructure.getPaperNumber() + objectivePaperType, true, objectivePaperType, syncObjectiveStructureDatas);
+                boolean syncObjectiveStructure = stmmsUtils.syncPaperStructure(examPaperStructure.getSchoolId(), String.valueOf(examPaperStructure.getThirdRelateId()), examPaperStructure.getPaperNumber() + objectivePaperType, true, null, syncObjectiveStructureDatas);
                 if (syncObjectiveStructure) {
                     atomicInteger.getAndIncrement();
                 }
@@ -299,7 +299,7 @@ public class DataSyncServiceImpl implements DataSyncService {
                     syncStructureData.setTotalScore(Double.valueOf(m.getScore()));
                     return syncStructureData;
                 }).collect(Collectors.toList());
-                boolean syncSubjectiveStructure = stmmsUtils.syncPaperStructure(examPaperStructure.getSchoolId(), String.valueOf(examPaperStructure.getThirdRelateId()), examPaperStructure.getPaperNumber() + subjectivePaperType, true, subjectivePaperType, syncSubjectiveStructureDatas);
+                boolean syncSubjectiveStructure = stmmsUtils.syncPaperStructure(examPaperStructure.getSchoolId(), String.valueOf(examPaperStructure.getThirdRelateId()), examPaperStructure.getPaperNumber() + subjectivePaperType, true, null, syncSubjectiveStructureDatas);
                 if (syncSubjectiveStructure) {
                     atomicInteger.getAndIncrement();
                 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamPaperStructureServiceImpl.java

@@ -210,7 +210,7 @@ public class ExamPaperStructureServiceImpl extends ServiceImpl<ExamPaperStructur
         for (String str : paperType.split(",")) {
             Map<String, Object> map = new HashMap<>();
             map.put("paperType", str);
-            List<Map> paperStructure = stmmsUtils.queryPaperStructure(examPaperStructure.getSchoolId(), String.valueOf(examPaperStructure.getThirdRelateId()), examPaperStructure.getPaperNumber() + str, str);
+            List<Map> paperStructure = stmmsUtils.queryPaperStructure(examPaperStructure.getSchoolId(), String.valueOf(examPaperStructure.getThirdRelateId()), examPaperStructure.getPaperNumber() + str, null);
             map.put("content", paperStructure);
             list.add(map);
         }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamPaperStructureController.java

@@ -70,7 +70,7 @@ public class ExamPaperStructureController {
         ExamPaperStructure examPaper = examPaperStructureService.upload(examPaperStructure, md5, files);
         // 推送云阅卷
         dataSyncService.uploadStructure(examPaper);
-        return ResultUtil.ok(true, null);
+        return ResultUtil.ok(String.valueOf(examPaper.getId()));
     }
 
     /**

distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -434,10 +434,10 @@ public class SysController {
     }
 
     /**
-     * 获取用户角色
+     * 获取用户阅卷角色
      * @return
      */
-    @ApiOperation(value = "获取用户角色")
+    @ApiOperation(value = "获取用户阅卷角色")
     @RequestMapping(value = "/get_open_role", method = RequestMethod.POST)
     public Result getOpenRole() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();

teachcloud-common/src/main/java/com/qmth/teachcloud/common/sync/StmmsUtils.java

@@ -114,10 +114,10 @@ public class StmmsUtils {
             map.put("teacher", validParam(teacher, "无", true, "教师姓名"));
             map.put("subjectCode", validParam(subjectCode, null, true, "科目代码")); // 取试卷编号
             map.put("subjectName", validParam(subjectName, null, true, "科目名称"));
-            map.put("packageCode", validParam(packageCode, null, false, "签到表编号"));
-            map.put("paperType", validParam(paperType, null, false, "试卷类型"));
-            map.put("examSite", validParam(examSite, null, false, "考点"));
-            map.put("examRoom", validParam(examRoom, null, false, "考场"));
+            map.put("packageCode", validParam(packageCode, "", false, "签到表编号"));
+            map.put("paperType", validParam(paperType, "", false, "试卷类型"));
+            map.put("examSite", validParam(examSite, "", false, "考点"));
+            map.put("examRoom", validParam(examRoom, "", false, "考场"));
 
             String result = HttpKit.sendPost(postUrl, getHeaders(schoolId, studentSaveUrl), map, null, null, null);
             JSONObject jsonObject = JSONObject.parseObject(result);
@@ -211,7 +211,7 @@ public class StmmsUtils {
             map.put("examId", validParam(examId, null, true, "考试ID"));
             map.put("subjectCode", validParam(subjectCode, null, true, "科目代码")); // 取试卷编号
             map.put("objective", validParam(objective, true, true, "是否客观题"));
-            map.put("paperType", validParam(paperType, null, true, "试卷类型"));
+            map.put("paperType", validParam(paperType, "", false, "试卷类型"));
             map.put("questions", validParam(objective, questions));
 
             String jsonData = JSONObject.toJSONString(map);
@@ -247,7 +247,7 @@ public class StmmsUtils {
             Map<String, String> map = new HashMap<>();
             map.put("examId", validParam(examId, null, true, "考试ID"));
             map.put("subjectCode", validParam(subjectCode, null, true, "科目代码")); // 取试卷编号
-            map.put("paperType", validParam(paperType, null, false, "试卷类型"));
+            map.put("paperType", validParam(paperType, "", false, "试卷类型"));
 
             String result = HttpKit.sendPost(postUrl, map, getHeaders(schoolId, queryPaperStructure));
             return JSONObject.parseArray(JSONObject.toJSON(result).toString(), Map.class);