update

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

@@ -2,11 +2,7 @@ package com.mooctest.crowd.domain.dao;
 
 import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 import com.mooctest.crowd.domain.model.RankInfo;
-<<<<<<< HEAD
 import com.mooctest.crowd.domain.model.RankInfos;
-=======
-import com.mooctest.crowd.domain.model.TechnicalArticlesPO;
->>>>>>> 787ffae43e39377b3c3024cdf1d4e2e71cbb7a65
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;

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

@@ -208,7 +208,7 @@ public class CommonRepo {
                 Predicate predicate = cb.conjunction();
                 if(code != null) {
                     predicate.getExpressions().add(
-                            cb.equal(a.get("platform"), code)
+                            cb.equal(a.get("applicationType"), code)
                     );
                 }
                 return predicate;

site/src/main/java/com/mooctest/crowd/site/mediator/ViewMediator.java

@@ -99,4 +99,6 @@ public interface ViewMediator {
     BankCardDTO deleteBankCard(long id,long userId);
 
     TechnicalArticlesDTO  updateRanking(long id);
+
+    List<ResourceVO>  getTestResource();
 }

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -105,6 +105,12 @@ public class WebMediatorImpl implements ViewMediator {
     private ApplicationTypeDao applicationTypeDao;
 
     @Autowired
+    private  ResourceDao resourceDao;
+
+    @Autowired
+    private ResourceTypeDao resourceTypeDao;
+
+    @Autowired
     private FieldDao fieldDao;
 
     @Value("${agency}")
@@ -996,6 +1002,20 @@ public class WebMediatorImpl implements ViewMediator {
         return technicalArticlesDTO;
     }
 
+    @Override
+    public List<ResourceVO> getTestResource() {
+        List<ResourceVO> resourceVOList = new ArrayList<>();
+        resourceDao.findAll().forEach(resourcePO -> {
+            ResourceVO resourceVO = new ResourceVO();
+            resourceVO.setCode(resourcePO.getCode());
+            Optional<ResourceTypePO> type = resourceTypeDao.findByCode(resourcePO.getType());
+            resourceVO.setType(type.get().getName());
+            resourceVOList.add(resourceVO);
+        });
+        List<ResourceVO> results = resourceVOList.stream().distinct().collect(Collectors.toList());
+        return results;
+    }
+
     private ProjectOperationControl initProjectPermission(CrowdTestProject project, User user) {
         ProjectOperationControl operationControl = new ProjectOperationControl();
         if (user == null)

site/src/main/java/com/mooctest/crowd/site/service/CommonService.java

@@ -34,7 +34,7 @@ public interface CommonService {
 
     Page<CompetitionVO> getCompetition(Pageable pageable,String keyword);
 
-    Page<ResourceVO> getResource(Pageable pageable,String keyword);
-
     Page<CrowdProjectVO> getProjectList(Pageable pageable,String code);
+
+    List<ResourceVO>  getResource();
 }

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

@@ -103,12 +103,13 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public Page<ResourceVO> getResource(Pageable pageable, String keyword) {
-        return commonRepo.findAllResourceByPage(pageable, keyword).map(resource -> new ResourceVO(resource));
+    public Page<CrowdProjectVO> getProjectList(Pageable pageable, String code) {
+        return commonRepo.getProjectList(pageable,code).map(project->new CrowdProjectVO(project));
     }
 
     @Override
-    public Page<CrowdProjectVO> getProjectList(Pageable pageable, String code) {
-        return commonRepo.getProjectList(pageable,code).map(project->new CrowdProjectVO(project));
+    public List<ResourceVO> getResource() {
+        List<ResourceVO>  resourceVOList  =viewMediator.getTestResource();
+        return resourceVOList;
     }
 }