获取全部任务，修改为通过Dao获取，任务广场加载速度变快啦！

core/src/main/java/com/mooctest/crowd/domain/dao/AgencyAbilityDao.java

@@ -24,7 +24,7 @@ public interface AgencyAbilityDao extends PagingAndSortingRepository<EvaluationA
 
     EvaluationAgencyAbilityPO save(EvaluationAgencyAbilityPO evaluationAgencyPO);
 
-    List<EvaluationAgencyAbilityPO> saveAll(List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList);
+//    List<EvaluationAgencyAbilityPO> saveAll(List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList);
 
 
 }

core/src/main/java/com/mooctest/crowd/domain/dao/AgencyResourceDao.java

@@ -21,7 +21,7 @@ public interface AgencyResourceDao extends PagingAndSortingRepository<Evaluation
 
     EvaluationAgencyResourcePO save(EvaluationAgencyResourcePO evaluationAgencyPO);
 
-    List<EvaluationAgencyResourcePO> saveAll(List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList);
+//    List<EvaluationAgencyResourcePO> saveAll(List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList);
 
     @Override
     void deleteAll(Iterable<? extends EvaluationAgencyResourcePO> iterable);

core/src/main/java/com/mooctest/crowd/domain/domainobject/User.java

@@ -221,7 +221,6 @@ public class User {
                 }
             }
             crowdTestTaskListResult.add(crowdTestTask);
-
         }
         crowdTestProject.setCrowdTestTaskList(crowdTestTaskListResult);
         return crowdTestProject;

core/src/main/java/com/mooctest/crowd/domain/factory/CrowdTestProjectFactory.java

@@ -51,4 +51,9 @@ public class CrowdTestProjectFactory {
         report.setIsDeleted(0);
         return report;
     }
+
+    public static CrowdTestTask defaultTask() {
+        CrowdTestTask task = new CrowdTestTask();
+        return task;
+    }
 }

core/src/main/java/com/mooctest/crowd/domain/repository/EvaluationAgencyRepo.java

@@ -58,10 +58,10 @@ public class EvaluationAgencyRepo implements IEvaluationAgencyRepo {
         return Converter.convert(EvaluationAgencyResource.class, evaluationAgencyResourceResult);
     }
 
-    public List<EvaluationAgencyResource> saveAllResource(List<EvaluationAgencyResource> sourceList){
-        List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = agencyResourceDao.saveAll(sourceList.stream().map(source -> Converter.convert(EvaluationAgencyResourcePO.class, source)).collect(Collectors.toList()));
-        return evaluationAgencyResourcePOList.stream().map(sourcePO -> Converter.convert(EvaluationAgencyResource.class, sourcePO)).collect(Collectors.toList());
-    }
+//    public List<EvaluationAgencyResource> saveAllResource(List<EvaluationAgencyResource> sourceList){
+//        List<EvaluationAgencyResourcePO> evaluationAgencyResourcePOList = agencyResourceDao.saveAll(sourceList.stream().map(source -> Converter.convert(EvaluationAgencyResourcePO.class, source)).collect(Collectors.toList()));
+//        return evaluationAgencyResourcePOList.stream().map(sourcePO -> Converter.convert(EvaluationAgencyResource.class, sourcePO)).collect(Collectors.toList());
+//    }
 
 
     //能力
@@ -71,10 +71,10 @@ public class EvaluationAgencyRepo implements IEvaluationAgencyRepo {
         return Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO);
     }
 
-    public List<EvaluationAgencyAbility> saveAllAbility(List<EvaluationAgencyAbility> abilityList){
-        List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = agencyAbilityDao.saveAll(abilityList.stream().map(source -> Converter.convert(EvaluationAgencyAbilityPO.class, source)).collect(Collectors.toList()));
-        return evaluationAgencyAbilityPOList.stream().map(abilityPO -> Converter.convert(EvaluationAgencyAbility.class, abilityPO)).collect(Collectors.toList());
-    }
+//    public List<EvaluationAgencyAbility> saveAllAbility(List<EvaluationAgencyAbility> abilityList){
+//        List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = agencyAbilityDao.saveAll(abilityList.stream().map(source -> Converter.convert(EvaluationAgencyAbilityPO.class, source)).collect(Collectors.toList()));
+//        return evaluationAgencyAbilityPOList.stream().map(abilityPO -> Converter.convert(EvaluationAgencyAbility.class, abilityPO)).collect(Collectors.toList());
+//    }
 
     @Override
     public void moveEvaluationAgencyAbility(List<EvaluationAgencyAbility> evaluationAgencyAbilityList){

core/src/main/java/com/mooctest/crowd/domain/repository/IEvaluationAgencyRepo.java

@@ -17,7 +17,7 @@ public interface IEvaluationAgencyRepo {
 
     EvaluationAgencyResource saveEvaluationAgencyResource(EvaluationAgencyResource evaluationAgencyResource);
 
-    List<EvaluationAgencyResource> saveAllResource(List<EvaluationAgencyResource> sourceList);
+//    List<EvaluationAgencyResource> saveAllResource(List<EvaluationAgencyResource> sourceList);
 
     EvaluationAgencyAbility saveEvaluationAgencyAbility(EvaluationAgencyAbility EvaluationAgencyAbility);
 

site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

@@ -1,10 +1,12 @@
 package com.mooctest.crowd.site.service.impl;
 
+import com.mooctest.crowd.domain.dao.CrowdTestTaskDao;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
 import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
 import com.mooctest.crowd.domain.domainobject.CrowdTestTaskStatus;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.CrowdTestTaskNotExistException;
+import com.mooctest.crowd.domain.factory.CrowdTestProjectFactory;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import com.mooctest.crowd.site.command.CrowdTestTaskCommand;
 import com.mooctest.crowd.site.data.dto.TaskDetailsDTO;
@@ -14,6 +16,7 @@ import com.mooctest.crowd.site.data.vo.CrowdReportVO;
 import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
 import com.mooctest.crowd.site.service.CrowdTaskService;
 import com.mooctest.crowd.site.util.GenerateFlowCodeUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +36,9 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     @Autowired
     CrowdTestProjectRepo projectRepo;
 
+    @Autowired
+    CrowdTestTaskDao taskDao;
+
 //    @Autowired
 //    GenerateFlowCodeUtil codeUtil;
 
@@ -86,10 +92,12 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
 
     @Override
     public TaskSquareDTO getAllTasks() {
-        List<CrowdTaskVO> taskVOList = new ArrayList<>();
-        projectRepo.getAllCrowdTestProject().stream().forEach(project -> {
-            taskVOList.addAll(project.getCrowdTestTaskList().stream().filter(crowdTestTask -> crowdTestTask.getStatus()==CrowdTestTaskStatus.HAS_RELEASED).map(crowdTestTask -> new CrowdTaskVO(crowdTestTask)).collect(Collectors.toList()));
-        });
+        List<CrowdTaskVO> taskVOList = taskDao.findAllByIsDeleted(0).stream().map(crowdTestTaskPO -> {
+            CrowdTestTask task = CrowdTestProjectFactory.defaultTask();
+            BeanUtils.copyProperties(crowdTestTaskPO, task);
+            return task;
+        }).collect(Collectors.toList()).stream().filter(crowdTestTask -> crowdTestTask.getStatus() == CrowdTestTaskStatus.HAS_RELEASED)
+                .map(CrowdTaskVO::new).collect(Collectors.toList());
         TaskSquareDTO taskSquareDTO = new TaskSquareDTO();
         taskSquareDTO.setCrowdTaskVOList(taskVOList);
         return taskSquareDTO;