质检

src/main/java/com/ssj/api/controller/ApiManagerTeacherQualityController.java

@@ -78,7 +78,7 @@ public class ApiManagerTeacherQualityController extends BaseController {
     public ResponseEntity findCheckHomeworkPictureList(@RequestParam(name = "accessToken") String accessToken,@RequestBody @Valid TeacherAllotReq req){
         ResponseEntity responseEntity = new ResponseEntity();
         try {
-            List<HomeworkPictureCheckDto> homeworkPictures = kmtCorrectSysService.findCheckHomeworkPictureList(req.getHomeworkId(), req.getTeacherId());
+            List<HomeworkPictureCheckDto> homeworkPictures = kmtCorrectSysService.findCheckHomeworkPictureList(req.getHomeworkId(), req.getTeacherId(),accessToken);
             Map<String, Object> data = new HashMap<>();
             data.put("homeworkPictures", homeworkPictures);
             responseEntity.success(data, "请求成功");

src/main/java/com/ssj/api/request/RequestOpenApiUtils.java

@@ -3,6 +3,7 @@ package com.ssj.api.request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ssj.framework.core.util.HttpRemote;
 import com.ssj.framework.core.util.PropertiesUtil;
@@ -51,6 +52,72 @@ public class RequestOpenApiUtils {
 		}
 	}
 	
+	
+	public static JSONObject openApiServiceRecognitionResult(String homeworkPictureId,String accessToken) {
+		try {
+			//String host=PropertiesUtil.getValue("API_OPEN_URL");
+			//String accessToken=createOpenToken(appid, accessKey);
+			String url="https://master.sharingschool.com/sz/api/kmt/homeworkCorrect/V2/recognitionResult?accessToken="+accessToken;
+			
+			JSONObject json=new JSONObject();
+			json.put("homeworkPictureId", homeworkPictureId);
+		
+			logger.info("调用第三方接口【openApiServiceRecognitionResult】，请求URL："+url);
+			logger.info("调用第三方接口【openApiServiceRecognitionResult】，请求参数："+json);
+			String text=HttpRemote.POSTMethod(url, json.toJSONString());
+			logger.info("调用第三方接口【openApiServiceRecognitionResult】，返回结果："+text);
+			JSONObject reqJSONObject=JSONObject.parseObject(text);
+			if("999".equals(reqJSONObject.getString("code"))) {
+				return reqJSONObject.getJSONObject("data");
+			}
+		} catch (Exception e) {
+			logger.info("调用第三方接口【openApiServiceRecognitionResult】，异常");
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	
+	
+	public static JSONArray openApiServiceAnswerList(JSONObject json,String accessToken) {
+		try {
+			//String host=PropertiesUtil.getValue("API_OPEN_URL");
+			//String accessToken=createOpenToken(appid, accessKey);
+			if(json==null) {
+				return null;
+			}
+			String url="https://master.sharingschool.com/sz/api/kmt/homeworkCorrect/V2/answerList?accessToken="+accessToken;
+			logger.info("调用第三方接口【openApiServiceAnswerList】，请求URL："+url);
+			logger.info("调用第三方接口【openApiServiceAnswerList】，请求参数："+json);
+			String text=HttpRemote.POSTMethod(url, json.toJSONString());
+			logger.info("调用第三方接口【openApiServiceAnswerList】，返回结果："+text);
+			JSONObject reqJSONObject=JSONObject.parseObject(text);
+			if("999".equals(reqJSONObject.getString("code"))) {
+				return reqJSONObject.getJSONObject("data").getJSONArray("list");
+			}
+		} catch (Exception e) {
+			logger.info("调用第三方接口【openApiServiceAnswerList】，异常");
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	
+	
+	public static void main(String[] args) {
+		String homeworkPictureId="20210302450448243884597248";
+		String accessToken="14DF5C279E734453ABA929744F81A833";
+		JSONObject json=openApiServiceRecognitionResult(homeworkPictureId, accessToken);
+		System.out.println(json);
+		json.put("homeworkPictureId", homeworkPictureId);
+		
+		JSONArray json1=openApiServiceAnswerList(json, accessToken);
+		System.out.println(json1);
+		
+		
+	}
+	
+	
 
 	
 	

src/main/java/com/ssj/service/kmt/correctsys/KmtCorrectSysServiceImpl.java

@@ -17,7 +17,9 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ssj.api.request.RequestOpenApiUtils;
 import com.ssj.bean.sys.homework.domain.HomeworkPicture;
 import com.ssj.bean.sys.homework.domain.HomeworkPictureCorrect;
 import com.ssj.bean.sys.homework.domain.HomeworkPictureErrorCheck;
@@ -34,7 +36,6 @@ import com.ssj.framework.core.util.ResponseConstant;
 import com.ssj.framework.core.util.ResponseEntity;
 import com.ssj.framework.core.util.StringUtil;
 import com.ssj.framework.weixin.util.DateUtil;
-import com.ssj.service.conch.schoolmaster.util.Constant;
 import com.ssj.service.kmt.constant.KnowledgeVersion;
 import com.ssj.service.kmt.correctsys.dto.HomeworkCheckDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkCheckKnowDetailDto;
@@ -46,7 +47,6 @@ import com.ssj.service.kmt.correctsys.dto.HomeworkPictureCheckHowDetailDto;
 import com.ssj.service.kmt.correctsys.dto.HomeworkPictureDto;
 import com.ssj.service.kmt.correctsys.request.CorrectCheckReq;
 import com.ssj.service.kmt.correctsys.service.KmtCorrectSysService;
-import com.ssj.service.kmt.dto.ExerciseQuestionAnswer4CorrectDTO;
 import com.ssj.service.kmt.dto.ExerciseQuestionAnswerDto;
 import com.ssj.service.kmt.dto.ExerciseQuestionDto;
 import com.ssj.service.sys.homework.service.HomeworkPictureCorrectService;
@@ -98,8 +98,8 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
     private HomeworkPictureErrorCheckService homeworkPictureErrorCheckService;
 
     @Override
-    public List<HomeworkPictureCheckDto> findCheckHomeworkPictureList(String homeworkId, String teacherId) {
-        List<HomeworkPictureCheckDto> result = this.findCorrectCheckHomeworkPictureList(homeworkId, teacherId);
+    public List<HomeworkPictureCheckDto> findCheckHomeworkPictureList(String homeworkId, String teacherId,String accessToken) {
+        List<HomeworkPictureCheckDto> result = this.findCorrectCheckHomeworkPictureList(homeworkId, teacherId,accessToken);
         return result;
     }
 
@@ -167,7 +167,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
      */
     private HomeworkPictureCheckDto getFeedbackHomeworkPictureData(HomeworkPicture homeworkPicture,
                                                                    Map<String, List<HomeworkExerciseQuestionsDto>> exerciseQuestionDtoMap,
-                                                                   Map<String, List<HomeworkCheckKnowDetailDto>> homeworkCheckKnowDetailDtoMap) {
+                                                                   Map<String, List<HomeworkCheckKnowDetailDto>> homeworkCheckKnowDetailDtoMap,String accessToken) {
         HomeworkPictureCheckDto homeworkPictureCheckDto = new HomeworkPictureCheckDto();
         homeworkPictureCheckDto.setHomeworkPictureId(homeworkPicture.getId());
         homeworkPictureCheckDto.setPath(homeworkPicture.getFileKey());
@@ -247,17 +247,21 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
                                     Collectors.toList())));
 //        Map<String, List<ExerciseQuestionDto>> temp = exerciseQuestionDtoList.stream().collect(Collectors
 //        .groupingBy(ExerciseQuestionDto::getBigQuestionIndex, LinkedHashMap::new, Collectors.toList()));
-            List<ExerciseQuestionAnswer4CorrectDTO> exerciseQuestionAnswer4CorrectDTOList = new ArrayList<>();
-            temp1.forEach((bookCourseId, map) -> {
-                map.forEach((bigQuestionIndex, questionList) -> {
-                    ExerciseQuestionAnswer4CorrectDTO exerciseQuestionAnswer4CorrectDTO =
-                            new ExerciseQuestionAnswer4CorrectDTO();
-                    exerciseQuestionAnswer4CorrectDTO.setBigQuestionIndex(bigQuestionIndex);
-                    exerciseQuestionAnswer4CorrectDTO.setQuestionList(questionList);
-                    exerciseQuestionAnswer4CorrectDTOList.add(exerciseQuestionAnswer4CorrectDTO);
-                });
-            });
-            homeworkPictureCheckDto.setAnswers(exerciseQuestionAnswer4CorrectDTOList);
+//            List<ExerciseQuestionAnswer4CorrectDTO> exerciseQuestionAnswer4CorrectDTOList = new ArrayList<>();
+//            temp1.forEach((bookCourseId, map) -> {
+//                map.forEach((bigQuestionIndex, questionList) -> {
+//                    ExerciseQuestionAnswer4CorrectDTO exerciseQuestionAnswer4CorrectDTO =
+//                            new ExerciseQuestionAnswer4CorrectDTO();
+//                    exerciseQuestionAnswer4CorrectDTO.setBigQuestionIndex(bigQuestionIndex);
+//                    exerciseQuestionAnswer4CorrectDTO.setQuestionList(questionList);
+//                    exerciseQuestionAnswer4CorrectDTOList.add(exerciseQuestionAnswer4CorrectDTO);
+//                });
+//            });
+            
+            JSONObject json=RequestOpenApiUtils.openApiServiceRecognitionResult(homeworkPicture.getId(), accessToken);
+            json.put("homeworkPictureId", homeworkPicture.getId());
+            JSONArray jSONArray=RequestOpenApiUtils.openApiServiceAnswerList(json, accessToken);
+            homeworkPictureCheckDto.setAnswers(jSONArray);
         }
         //手动勾选的知识点
         List<HomeworkCheckKnowDetailDto> howDetailTmp = null;
@@ -362,7 +366,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
     
 
     @Override
-    public List<HomeworkPictureCheckDto> findCorrectCheckHomeworkPictureList(String homeworkId, String teacherId) {
+    public List<HomeworkPictureCheckDto> findCorrectCheckHomeworkPictureList(String homeworkId, String teacherId,String accessToken) {
         List<HomeworkPictureDto> homeworkPictures =
                 homeworkPictureService.findCheckHomeworkPictureByHomeworkId(homeworkId);
         List<HomeworkPictureCheckDto> result = new ArrayList<>();
@@ -447,7 +451,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
                             //批改完才把补拍的显示出来
                             if (homeworkPicture.getIsFeedback() == 1) {
                                 homeworkPictureCheckDto = this.getFeedbackHomeworkPictureData(homeworkPicture,
-                                        exerciseQuestionDtoMap, null);
+                                        exerciseQuestionDtoMap, null,accessToken);
                                 if (this.isOtherTeachersWork(teacherId, homeworkPicture, 1)) {
                                     homeworkPictureCheckDto.setType(4);
                                     homeworkPictureCheckDto.setSecondType(4);
@@ -461,7 +465,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
                         }
                     } else {
                         homeworkPictureCheckDto = this.getFeedbackHomeworkPictureData(homeworkPicture,
-                                exerciseQuestionDtoMap, null);
+                                exerciseQuestionDtoMap, null,accessToken);
                         if (homeworkPicture.getIsMark() == 4) {
                             homeworkPictureCheckDto.setSecondType(3);
                         } else {
@@ -480,7 +484,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 
                 } else {
                     homeworkPictureCheckDto = this.getFeedbackHomeworkPictureData(homeworkPicture,
-                            exerciseQuestionDtoMap, null);
+                            exerciseQuestionDtoMap, null,accessToken);
                     //非学科图片
                     if (homeworkPicture.getIsDelete() == 1) {
                         homeworkPictureCheckDto.setSecondType(3);
@@ -513,30 +517,7 @@ public class KmtCorrectSysServiceImpl implements KmtCorrectSysService {
 
     @Override
     public List<HomeworkPictureCheckDto> findKnowledgeCheckHomeworkPictureList(String homeworkId, String teacherId) {
-        List<HomeworkPictureDto> homeworkPictures =
-                homeworkPictureService.findKnowCheckHomeworkPictureByHomeworkId(homeworkId);
-        List<HomeworkCheckKnowDetailDto> homeworkCheckKnowDetailDtos =
-                correctSysQueryDao.findHomeworkCorrectedKnowledge(homeworkId);
-        Map<String, List<HomeworkCheckKnowDetailDto>> homeworkCheckKnowDetailDtoMap =
-                homeworkCheckKnowDetailDtos.stream().collect(Collectors.groupingBy(HomeworkCheckKnowDetailDto::getHomeworkPictureId));
-        List<HomeworkPictureCheckDto> result = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(homeworkPictures)) {
-            //登记图片
-            this.findCheckPicture(result, homeworkPictures.get(0).getVipId(), homeworkPictures.get(0).getCreateTime());
-            for (HomeworkPictureDto homeworkPictureDto : homeworkPictures) {
-                //属性copy
-                HomeworkPicture homeworkPicture = this.copyHomeworkPictureDto2HomeworkPicture(homeworkPictureDto);
-                HomeworkPictureCheckDto homeworkPictureCheckDto = this.getFeedbackHomeworkPictureData(homeworkPicture
-                        , null, homeworkCheckKnowDetailDtoMap);
-                if (this.isOtherTeachersWork(teacherId, homeworkPicture, 2)) {
-                    homeworkPictureCheckDto.setType(4);
-                    homeworkPictureCheckDto.setSecondType(4);
-                }
-                result.add(homeworkPictureCheckDto);
-            }
-        }
-
-        return result;
+        return null;
     }
 
     /**

src/main/java/com/ssj/service/kmt/correctsys/dto/HomeworkPictureCheckDto.java

@@ -1,12 +1,13 @@
 package com.ssj.service.kmt.correctsys.dto;
 
-import com.ssj.service.conch.parents.v1.dto.CompositionCommentModuleDTO;
-import com.ssj.service.kmt.dto.ExerciseQuestionAnswer4CorrectDTO;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.alibaba.fastjson.JSONArray;
+import com.ssj.service.conch.parents.v1.dto.CompositionCommentModuleDTO;
+import com.ssj.service.kmt.dto.ExerciseQuestionAnswer4CorrectDTO;
+
 public class HomeworkPictureCheckDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -38,7 +39,7 @@ public class HomeworkPictureCheckDto implements Serializable {
      */
     private String checkTime;
 
-    private List<ExerciseQuestionAnswer4CorrectDTO>  answers = new ArrayList<>();
+    private JSONArray answers = new JSONArray();
 
     private HomeworkPictureCheckHowDetailDto howDetail = null;
 
@@ -67,16 +68,16 @@ public class HomeworkPictureCheckDto implements Serializable {
     public void setType(int type) {
         this.type = type;
     }
+    
+    public JSONArray getAnswers() {
+		return answers;
+	}
 
-    public List<ExerciseQuestionAnswer4CorrectDTO> getAnswers() {
-        return answers;
-    }
-
-    public void setAnswers(List<ExerciseQuestionAnswer4CorrectDTO> answers) {
-        this.answers = answers;
-    }
+	public void setAnswers(JSONArray answers) {
+		this.answers = answers;
+	}
 
-    public HomeworkPictureCheckHowDetailDto getHowDetail() {
+	public HomeworkPictureCheckHowDetailDto getHowDetail() {
         return howDetail;
     }
 

src/main/java/com/ssj/service/kmt/correctsys/service/KmtCorrectSysService.java

@@ -27,7 +27,7 @@ public interface KmtCorrectSysService {
      * @param homeworkId
      * @return
      */
-    List<HomeworkPictureCheckDto> findCheckHomeworkPictureList (String homeworkId, String teacherId);
+    List<HomeworkPictureCheckDto> findCheckHomeworkPictureList (String homeworkId, String teacherId,String accessToken);
 
 
     /**
@@ -35,7 +35,7 @@ public interface KmtCorrectSysService {
      * @param homeworkId
      * @return
      */
-    List<HomeworkPictureCheckDto> findCorrectCheckHomeworkPictureList (String homeworkId, String teacherId);
+    List<HomeworkPictureCheckDto> findCorrectCheckHomeworkPictureList (String homeworkId, String teacherId,String accessToken);
 
     /**
      * 查询作业的批改图片数据