Merge branch 'fix-admin' into 'DEV'

add keyanlysisvo







See merge request !350

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/KeyAnalysisVO.java

@@ -0,0 +1,20 @@
+package cn.iselab.mooctest.site.web.data;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by ROGK on 2017/10/23.
+ */
+@Data
+public class KeyAnalysisVO {
+
+    private Long taskId;
+
+    private String taskName;
+
+    private String workerName;
+
+    private List<CaseExtendsVO> caseVOS;
+}

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

@@ -2,6 +2,7 @@ package cn.iselab.mooctest.site.web.logic;
 
 import cn.iselab.mooctest.site.web.data.CaseExtendsVO;
 import cn.iselab.mooctest.site.web.data.CaseVO;
+import cn.iselab.mooctest.site.web.data.KeyAnalysisVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -38,5 +39,5 @@ public interface CaseLogic {
 
     List<CaseExtendsVO> getCasesByExamId(Long paperId);
 
-    List<CaseExtendsVO> getCasesByKey(String key) throws Exception;
+    KeyAnalysisVO getCasesByKey(String key) throws Exception;
 }

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

@@ -17,6 +17,7 @@ import cn.iselab.mooctest.site.service.fromKibug.ReportService;
 import cn.iselab.mooctest.site.service.instancePermission.CasePermissionService;
 import cn.iselab.mooctest.site.web.data.CaseExtendsVO;
 import cn.iselab.mooctest.site.web.data.CaseVO;
+import cn.iselab.mooctest.site.web.data.KeyAnalysisVO;
 import cn.iselab.mooctest.site.web.data.wrapper.AppVOWrapper;
 import cn.iselab.mooctest.site.web.data.wrapper.CaseExtendsVOWrapper;
 import cn.iselab.mooctest.site.web.data.wrapper.CaseVOWrapper;
@@ -352,11 +353,14 @@ public class CaseLogicImpl implements CaseLogic {
     }
 
     @Override
-    public List<CaseExtendsVO> getCasesByKey(String key) throws Exception{
+    public KeyAnalysisVO getCasesByKey(String key) throws Exception{
         String[] result=indexService.deSecret(key);
         String workerId=result[1];
         String examId=result[0];
         List<CaseExtendsVO> caseVoList = new ArrayList<>();
+        KeyAnalysisVO keyVO = new KeyAnalysisVO();
+        User user =userService.findByUserId(Long.parseLong(workerId));
+        Task task = taskService.getTask(Long.parseLong(examId));
         List<CaseBlock> caseBlocks = exam2CaseService.getCasesByExamId(Long.parseLong(examId));
         for (CaseBlock caseBlock : caseBlocks) {
             if (caseBlock.getCaseIds().size() < 1) {
@@ -370,7 +374,11 @@ public class CaseLogicImpl implements CaseLogic {
             caseExtendsVO.setAppLocation(str.substring(0,str.indexOf("?")));
             caseVoList.add(caseExtendsVO);
         }
-        return caseVoList;
+        keyVO.setTaskId(Long.parseLong(examId));
+        keyVO.setTaskName(task.getName());
+        keyVO.setWorkerName(user.getName());
+        keyVO.setCaseVOS(caseVoList);
+        return keyVO;
     }
 
     private void injectManagerNames(List<CaseVO> caseVOs) {