Revert "MOD: userCatch"

This reverts commit b1cb99af548e53d8d6a0e7d3cbe2f8ce91f66637.

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/ScoreController.java

@@ -88,8 +88,11 @@ public class ScoreController extends BaseController {
                                  @PathVariable("uploadTime") String uploadTime,
                                  @RequestBody List<CaughtNodeDTO> caughtNodeDTOs) {
 
-//        calculateSocreLogic.catchNode(examId, caseId, userId, uploadTime, caughtNodeDTOs);
-        calculateSocreLogic.userCatch(examId, caseId, userId, uploadTime, caughtNodeDTOs);
+        calculateSocreLogic.catchNode(examId, caseId, userId, uploadTime, caughtNodeDTOs);
+        //计算分数并存储
+ //       generalCalculateScoreLogic.calculateScore(examId, caseId, userId);
+//        return caughtNodeDTOList;
+
     }
 
     @RequestMapping(value = UrlConstants.API_COMMON + "generalCalculateScoreAll/{examId}/{caseId}", method = RequestMethod.PUT)

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/CalculateSocreLogic.java

@@ -35,6 +35,4 @@ public interface CalculateSocreLogic {
 
     PageData<CompeteAnalysisVO> getCompeteAnalysisByPage(Long userId, Long examId, Long caseId, int activePage, int pageSize,
                                                                 Sort sort, CompeteAnalysisType competeAnalysisType);
-
-    void userCatch(long examId, long caseId, long userId, String uploadTime, List<CaughtNodeDTO> caughtNodeDTOs);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CalculateScoreLogicImpl.java

@@ -495,39 +495,4 @@ public class CalculateScoreLogicImpl extends BaseLogic implements CalculateSocre
         generalCalculateScoreComponent.saveCaughtDetails(examId, caseId, userId, caughtNodeDTOs, catchDTOList);
     }
 
-    @Override
-    public void userCatch(long examId, long caseId, long userId, String uploadTime, List<CaughtNodeDTO> caughtNodeDTOs) {
-        List<CatchDTO> catchDTOList = new ArrayList<>();
-        List<Node> nodesFromCase = caseLogic.getGraph(caseId, null).getNodes();
-        for (CaughtNodeDTO caughtNodeDTO : caughtNodeDTOs) {
-            if (caughtNodeDTO.getIfCatch().equals(Boolean.TRUE)) {
-                CatchDTO catchDTO = new CatchDTO();
-
-                catchDTO.setNodeName(caughtNodeDTO.getNodeName());
-                catchDTO.setUploadTime(uploadTime);
-                catchDTO.setCategory(caughtNodeDTO.getCategory());
-                catchDTOList.add(catchDTO);
-            }
-        }
-        List<UserCatchDTO> userCatchDTOs = userCatchService.getUserCatchDTOs(userId, examId, caseId);
-
-        if (userCatchDTOs != null) {
-            UserCatchDTO userCatchDTO = userCatchService.getUserCatchDTOs(userId, examId, caseId).get(0);
-            List<CatchDTO> catchDTOs = userCatchDTO.getCatchDTOs();
-            catchDTOs.addAll(catchDTOList);
-            userCatchDTO.setCatchDTOs(catchDTOs);
-            userCatchService.updateUserCatch(userCatchDTO);
-        } else {
-            UserCatchDTO userCatchDTO = new UserCatchDTO();
-            userCatchDTO.setCaseId(caseId);
-            userCatchDTO.setExamId(examId);
-            userCatchDTO.setUserId(userId);
-            List<CatchDTO> catchDTOs = new ArrayList<>();
-            catchDTOs.addAll(catchDTOList);
-            userCatchDTO.setCatchDTOs(catchDTOs);
-            userCatchService.createUserCatch(userCatchDTO);
-        }
-        //上传caughtNode userCatch结束，调用算分
-        generalCalculateScoreComponent.calculateGrade(examId, caseId, userId);
-    }
 }