获取众测人员 more

core/src/main/java/com/mooctest/crowd/domain/controller/CrowdTestProjectController.java

@@ -15,11 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/project/")
 public class CrowdTestProjectController {
 
-    @Autowired
-    private CrowdTestProjectRepo crowdTestProjectRepo;
 
-    @Autowired
-    private UserRepo userRepo;
 
 //    @RequestMapping(value = "findById/{crowdTestProjectId}", method = RequestMethod.GET)
 //    public String getCrowdTestProjectById(@PathVariable("crowdTestProjectId") Long crowdTestProjectId){

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

@@ -2,7 +2,11 @@ package com.mooctest.crowd.domain.domainobject;
 
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.SystemAdministratorException;
+import com.mooctest.crowd.domain.model.UserPO;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
 
 import java.sql.Timestamp;
 import java.util.List;
@@ -12,6 +16,7 @@ import java.util.List;
  * @date 2019/7/6 18:17
  */
 @Data
+
 public class User {
     private Long id;
     private String name;
@@ -34,6 +39,10 @@ public class User {
     private SystemAdministratorToUser systemAdministratorToUser;
     private List<Role> roleList;
 
+
+    public User() {
+    }
+
     @Override
     public String toString() {
         return "User{" +
@@ -59,6 +68,13 @@ public class User {
                 '}';
     }
 
+
+    public   User(UserPO userPO){
+        BeanUtils.copyProperties(userPO,this);
+    }
+
+
+
     /**
      * 机构认证——申请
      * @param evaluationAgency

site/src/main/java/com/mooctest/crowd/site/configuration/WebMvcConfiguration.java

@@ -35,4 +35,5 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 //        registry.addInterceptor(sysAdminCheckInterceptor)
 //                .addPathPatterns("/api/user/**");
     }
-}
+    }
+

site/src/main/java/com/mooctest/crowd/site/data/vo/UserVO.java

@@ -36,9 +36,14 @@ public class UserVO implements Serializable {
     private String personalCompetence;
     private String unit;
     private String county;
+    private String address;
+
+
+
 
     public UserVO(User user) {
         BeanUtils.copyProperties(user, this);
+        this.address=this.province+this.city;
         this.password = "********";
         if (user.getEvaluationAgency() != null) {
             this.authType = "agency";

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

@@ -19,12 +19,14 @@ import com.mooctest.crowd.site.data.enums.RoleType;
 import com.mooctest.crowd.site.data.vo.*;
 import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.UploadService;
+import com.mooctest.crowd.site.util.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
@@ -108,6 +110,50 @@ public class WebMediatorImpl implements ViewMediator {
     private String agencyId;
 
     @Override
+    public Page<UserVO> renderMoreUser(Pageable pageable) {
+        List<UserVO> userVOS=new ArrayList<>();
+        List<RankCountInfo> rankCountInfos=taskToUserDao.findTotalCountOfUser();
+        long []ids=new long[rankCountInfos.size()];
+        for(int i=0;i<rankCountInfos.size();i++){
+            if(userDao.findById(rankCountInfos.get(i).getEntityId()).isPresent()){
+                ids[i]=rankCountInfos.get(i).getEntityId();
+                Optional<UserPO> userPO=userDao.findById(ids[i]);
+                User  user=new User(userPO.get());
+                UserVO userVO=new UserVO(user);
+                userVO.setTaskCount(rankCountInfos.get(i).getCount());
+                userVOS.add(userVO);
+            }
+
+        }
+        Page<UserVO> Page= DataUtils.listToPage(userVOS,pageable);
+        return  Page;
+    }
+
+    @Override
+    public List<CrowdTaskVO> findMoreHotTasks() {
+        List<CrowdTestTaskPO> list=taskDao.findMoreHotTasks();//已经根据创建时间排序好了。
+        List<CrowdTaskVO> hotMoreTestprojects = taskDao.findMoreHotTasks().stream().map(crowdTestTaskPO -> {
+            CrowdTestTask task = new CrowdTestTask();
+            BeanUtils.copyProperties(crowdTestTaskPO, task);
+            return new CrowdTaskVO(task);
+        }).collect(Collectors.toList());
+        return hotMoreTestprojects;
+    }
+
+    @Override
+    public List<CrowdTestProjectVO> findMoreHotProjects() {
+       List<CrowdTestProjectPO> list=projectDao.findMoreHotProjects();//已经根据创建时间排序好了。
+       //根据 参加人数倒序排序
+        List<CrowdTestProjectVO> hotMoreTestprojects = projectDao.findMoreHotProjects().stream().map(crowdTestProjectPO -> {
+            CrowdTestProject project = new CrowdTestProject();
+            BeanUtils.copyProperties(crowdTestProjectPO, project);
+            return new CrowdTestProjectVO(project);
+        }).collect(Collectors.toList());
+        return hotMoreTestprojects;
+    }
+
+
+    @Override
     public EnterpriseAuthVO getEnterpriseAuthByUserId(Long userId) {
         EnterpriseAuthentication enterpriseAuthentication = new EnterpriseAuthentication();
         EnterpriseAuthenticationPO enterpriseAuthenticationPO = enterpriseAuthenticationDao.findByUserId(userId);

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

@@ -5,15 +5,23 @@ import com.mooctest.crowd.site.data.dto.IndexInfoDTO;
 import com.mooctest.crowd.site.data.dto.IndexPageDTO;
 import com.mooctest.crowd.site.data.dto.MyCrowdDTO;
 import com.mooctest.crowd.site.data.vo.CrowdProjectVO;
+
 import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
+import com.mooctest.crowd.site.data.vo.UserVO;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.awt.*;
 import java.util.Map;
 
 @Service
 public interface CommonService {
+
+
+    Page<UserVO> getMoreUser(Pageable pageable);
+
+
     IndexDTO getIndexInfo();
 
     MyCrowdDTO getPersonCrowd(Long userId);

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

@@ -15,6 +15,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.awt.*;
 import java.util.Map;
 
 @Service
@@ -42,6 +43,12 @@ public class CommonServiceImpl implements CommonService {
 //    private CacheUtil cacheUtil;
 
     @Override
+    public Page<UserVO> getMoreUser(Pageable pageable) {
+
+        return  viewMediator.renderMoreUser(pageable);
+    }
+
+    @Override
     public IndexDTO getIndexInfo() {
         return viewMediator.renderIndex();
     }