更新表格导入功能

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

@@ -2,7 +2,11 @@ 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;
@@ -74,4 +78,5 @@ public interface CrowdTestProjectDao extends CrudRepository<CrowdTestProjectPO,
 
     @Override
     <S extends CrowdTestProjectPO> S save(S s);
+
 }

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

@@ -62,6 +62,9 @@ public class CommonRepo {
     @Autowired
     private  ResourceTypeDao resourceTypeDao;
 
+    @Autowired
+    private CrowdTestProjectDao crowdTestProjectDao;
+
     public List<TestType> getAllTestType(){
         return testTypeDao.findAll().stream().map(testTypePO -> Converter.convert(TestType.class, testTypePO)).collect(Collectors.toList());
     }
@@ -195,4 +198,23 @@ public class CommonRepo {
             }
         };
     }
+
+    public Page<CrowdTestProject> getProjectList(Pageable pageable, String code){
+        Specifications<CrowdTestProjectPO> where =  Specifications.where(getCode(code));
+        return crowdTestProjectDao.findAll(where, pageable).map(crowdTestProjectPO -> Converter.convert(CrowdTestProject.class, crowdTestProjectPO));
+    }
+    private Specification<CrowdTestProjectPO> getCode(String code) {
+        return new Specification<CrowdTestProjectPO>() {
+            @Override
+            public Predicate toPredicate(Root<CrowdTestProjectPO> a, CriteriaQuery<?> q, CriteriaBuilder cb) {
+                Predicate predicate = cb.conjunction();
+                if(code != null) {
+                    predicate.getExpressions().add(
+                            cb.equal(a.get("platform"), code)
+                    );
+                }
+                return predicate;
+            }
+        };
+    }
 }

site/src/main/java/com/mooctest/crowd/site/controller/AgencyController.java

@@ -15,6 +15,7 @@ import com.mooctest.crowd.site.data.vo.AgencyVO;
 import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
 import com.mooctest.crowd.site.data.vo.SearchConditionVO;
 import com.mooctest.crowd.site.service.AgencyService;
+import com.mooctest.crowd.site.service.ResidentAgencyService;
 import com.mooctest.crowd.site.util.DataUtils;
 import lombok.extern.java.Log;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,8 @@ public class AgencyController extends BaseSearchController {
 
     @Autowired
     private AgencyService agencyService;
+    @Autowired
+    private ResidentAgencyService residentAgencyService;
 
     /**
      * 绿色通道：未登录情况直接录入认证信息，生成用户和评测机构信息
@@ -148,7 +151,7 @@ public class AgencyController extends BaseSearchController {
 
 
     @RequestMapping(value = "/agency/list/more", method = RequestMethod.GET)
-    public ResponseVO getMoreAgencyList(@RequestBody SearchConditionVO searchConditionVO) {
+    public ResponseVO getMoreAgencyList(@RequestBody SearchConditionVO searchConditionVO){
         Pageable pageable = this.getPageable(searchConditionVO);
         List<EvolutionAgencyVO> list = agencyService.findMoreAgencyVO();
         Page<EvolutionAgencyVO> page = DataUtils.listToPage(list, pageable);
@@ -156,8 +159,19 @@ public class AgencyController extends BaseSearchController {
     }
 
 
+    @RequestMapping(value = "resident/agency/more",method = RequestMethod.GET)
+    public  ResponseVO  getMoreResidentList(@RequestBody SearchConditionVO searchConditionVO){
+        Pageable pageable=this.getPageable(searchConditionVO);
+        return  new ResponseVO(ServerCode.SUCCESS,residentAgencyService.findAll(pageable));
+    }
+
+
+
+
+
+
     @Override
-    public Page<?> search(String searchCondition) {
+    public Page<?> search(String searchCondition){
         return null;
     }
 }

site/src/main/java/com/mooctest/crowd/site/controller/CrowTestSquareController.java

@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**
@@ -45,6 +46,7 @@ public class CrowTestSquareController extends BaseSearchController {
 
     /**
      * 获取众测广场首页所有的数据,包装到CrowdTestSquareIndexDTO里面     *
+     *
      * @return
      */
     @GetMapping("/list")
@@ -59,7 +61,6 @@ public class CrowTestSquareController extends BaseSearchController {
     }
 
 
-
     /**
      * 搜索框模糊分页查询接口
      */
@@ -97,7 +98,6 @@ public class CrowTestSquareController extends BaseSearchController {
         Page<CrowdTaskVO> taskVOPage = DataUtils.listToPage(crowdTestProjectVOList, pageable);
         return new ResponseVO(ServerCode.SUCCESS, taskVOPage);
 
-
     }
 
 

site/src/main/java/com/mooctest/crowd/site/data/dto/CrowdTestSquareIndexDTO.java

@@ -43,7 +43,7 @@ public class CrowdTestSquareIndexDTO {
         this.hotCrowdTestProjectVOs = list1.subList(0, 7);
         List<CrowdTaskVO> tasklist1 = crowdTestTaskVOS.subList(0, 6);
         List<CrowdTaskVO> tasklist2 = crowdTestTaskVOS.stream().sorted(Comparator.comparing(CrowdTaskVO::getAcceptedCount).reversed()).collect(Collectors.toList());
-        this.hotCrowdTaskVOs = crowdTestTaskVOS.subList(0, 7);
+        this.hotCrowdTaskVOs = tasklist2.subList(0, 7);
         this.crowdTestTaskVOS = tasklist1;
     }
 }

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

@@ -48,6 +48,7 @@ public class CrowdProjectVO implements Serializable {
     private Long regionManagerId;
     private StatusVO statusVO;
     private Boolean needHandle = false; //该项目需要处理
+    private Timestamp createTime;
 
     public CrowdProjectVO(CrowdTestProject project){
         this.id = project.getCode();
@@ -80,6 +81,7 @@ public class CrowdProjectVO implements Serializable {
         this.joinCount = project.getJoinCount();
         this.regionManagerId = project.getRegionalManagerId();
         this.renderStatus();
+        this.createTime=project.getCreateTime();
     }
 
     private void renderStatus(){

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

@@ -12,10 +12,22 @@ public class ResidentAgencyVO {
     private Long id;
     private Long agencyId;
     private Long userId;
+    private long   taskCount;
+    private String address;
+    private  String name;//机构名称
+
+
+
 
     public ResidentAgencyVO(ResidentAgency residentAgency){
         id = residentAgency.getId();
         agencyId = residentAgency.getAgencyId();
         userId = residentAgency.getUserId();
+
+    }
+
+
+    public  ResidentAgencyVO(){
+
     }
 }

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

@@ -28,7 +28,7 @@ import java.util.Optional;
  */
 public interface ViewMediator {
 
-    Page<UserVO> renderMoreUser(Pageable pageable);
+    List<UserVO> renderMoreUser(Pageable pageable);
 
 
 
@@ -99,6 +99,4 @@ public interface ViewMediator {
     BankCardDTO deleteBankCard(long id,long userId);
 
     TechnicalArticlesDTO  updateRanking(long id);
-
-    IndexInfoDTO getHotTesting();
 }

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

@@ -25,6 +25,7 @@ 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.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -108,7 +109,7 @@ public class WebMediatorImpl implements ViewMediator {
     private String agencyId;
 
     @Override
-    public Page<UserVO> renderMoreUser(Pageable pageable) {
+    public List<UserVO> renderMoreUser(Pageable pageable) {
         List<UserVO> userVOS=new ArrayList<>();
         List<RankCountInfo> rankCountInfos=taskToUserDao.findTotalCountOfUser();
         long []ids=new long[rankCountInfos.size()];
@@ -123,8 +124,7 @@ public class WebMediatorImpl implements ViewMediator {
             }
 
         }
-        Page<UserVO> Page= DataUtils.listToPage(userVOS,pageable);
-        return  Page;
+        return userVOS;
     }
 
     @Override
@@ -994,20 +994,6 @@ public class WebMediatorImpl implements ViewMediator {
         return technicalArticlesDTO;
     }
 
-    @Override
-    public IndexInfoDTO getHotTesting() {
-        IndexInfoDTO indexInfoDTO = new IndexInfoDTO();
-        Pageable pageable = PageRequest.of(0, 10);
-        List<ApplicationTypeVO> applicationTypeRank = projectDao.findTotalCountOfApplicationType(pageable).stream().map(rankInfos -> {
-            ApplicationType applicationType = commonRepo.getApplicationTypeByAppCode(rankInfos.getCode());
-            ApplicationTypeVO applicationTypeVO = new ApplicationTypeVO(applicationType);
-            applicationTypeVO.setCount(rankInfos.getCount());
-            return applicationTypeVO;
-        }).filter(Objects::nonNull).collect(Collectors.toList());
-        indexInfoDTO.setApplicationTypeRank(applicationTypeRank);
-        return  indexInfoDTO;
-    }
-
     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

@@ -8,6 +8,7 @@ import com.mooctest.crowd.site.data.vo.*;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import java.util.List;
 
 import java.util.Map;
 
@@ -15,7 +16,7 @@ import java.util.Map;
 public interface CommonService {
 
 
-    Page<UserVO> getMoreUser(Pageable pageable);
+    List<UserVO> getMoreUser(Pageable pageable);
 
     IndexDTO getIndexInfo();
 
@@ -34,4 +35,6 @@ public interface CommonService {
     Page<CompetitionVO> getCompetition(Pageable pageable,String keyword);
 
     Page<ResourceVO> getResource(Pageable pageable,String keyword);
+
+    Page<CrowdProjectVO> getProjectList(Pageable pageable,String code);
 }

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

@@ -0,0 +1,16 @@
+package com.mooctest.crowd.site.service;
+
+
+import com.mooctest.crowd.domain.model.ResidentAgencyPO;
+import com.mooctest.crowd.site.data.vo.ResidentAgencyVO;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import java.awt.*;
+
+public interface ResidentAgencyService {
+
+    Page<ResidentAgencyVO> findAll(Pageable pageable);
+
+
+}

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

@@ -43,7 +43,6 @@ public class AgencyServiceImpl implements AgencyService {
 
     @Autowired
     private UserAntiCorruption userAnti;
-
     @Autowired
     private UserDao userDao;
     @Autowired

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

@@ -14,7 +14,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -42,7 +42,7 @@ public class CommonServiceImpl implements CommonService {
 //    private CacheUtil cacheUtil;
 
     @Override
-    public Page<UserVO> getMoreUser(Pageable pageable) {
+    public List<UserVO> getMoreUser(Pageable pageable) {
 
         return  viewMediator.renderMoreUser(pageable);
     }
@@ -106,4 +106,9 @@ public class CommonServiceImpl implements CommonService {
     public Page<ResourceVO> getResource(Pageable pageable, String keyword) {
         return commonRepo.findAllResourceByPage(pageable, keyword).map(resource -> new ResourceVO(resource));
     }
+
+    @Override
+    public Page<CrowdProjectVO> getProjectList(Pageable pageable, String code) {
+        return commonRepo.getProjectList(pageable,code).map(project->new CrowdProjectVO(project));
+    }
 }

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

@@ -0,0 +1,68 @@
+package com.mooctest.crowd.site.service.impl;
+
+import com.mooctest.crowd.domain.dao.EvaluationAgencyDao;
+import com.mooctest.crowd.domain.dao.ResidentAgencyDao;
+import com.mooctest.crowd.domain.dao.TaskToUserDao;
+import com.mooctest.crowd.domain.dao.UserDao;
+import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
+import com.mooctest.crowd.domain.model.RankCountInfo;
+import com.mooctest.crowd.domain.model.ResidentAgencyPO;
+import com.mooctest.crowd.domain.model.UserPO;
+import com.mooctest.crowd.site.data.vo.ResidentAgencyVO;
+import com.mooctest.crowd.site.service.ResidentAgencyService;
+import com.mooctest.crowd.site.util.DataUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author:xx
+ * @date:2020/7/8
+ * @description:
+ */
+@Slf4j
+@Service
+public class ResidentServiceImpl implements ResidentAgencyService {
+    @Autowired
+    private TaskToUserDao taskToUserDao;
+    @Autowired
+    private ResidentAgencyDao residentAgencyDao;
+    @Autowired
+    private EvaluationAgencyDao agencyDao;
+    @Autowired
+    private UserDao userDao;
+
+
+    @Override
+    public Page<ResidentAgencyVO> findAll(Pageable pageable) {
+        List<ResidentAgencyVO> list = new ArrayList<>();
+        List<RankCountInfo> totalCountOfUser = taskToUserDao.findTotalCountOfUser();
+        long ids[] = new long[totalCountOfUser.size()];
+        List<ResidentAgencyPO> residentAgencyPOS = residentAgencyDao.findAll();
+        //获取品牌机构的用户id
+        long resagency[] = new long[residentAgencyPOS.size()];
+        for (int i = 0; i < residentAgencyPOS.size(); i++) {
+            ResidentAgencyVO residentAgencyVO = new ResidentAgencyVO();
+            Optional<UserPO> userPO = userDao.findById(residentAgencyPOS.get(i).getUserId());
+            resagency[i] = residentAgencyPOS.get(i).getUserId();
+            EvaluationAgencyPO evaluationAgencyPO = agencyDao.findByUserId(resagency[i]);
+            residentAgencyVO.setName(evaluationAgencyPO.getEvaluationAgencyName());
+            residentAgencyVO.setTaskCount(totalCountOfUser.get(i).getCount());
+            residentAgencyVO.setAddress(evaluationAgencyPO.getAddress());
+            residentAgencyVO.setAgencyId(residentAgencyPOS.get(i).getAgencyId());
+            residentAgencyVO.setId(residentAgencyPOS.get(i).getId());
+            residentAgencyVO.setUserId(residentAgencyPOS.get(i).getUserId());
+            list.add(residentAgencyVO);
+        }
+
+
+        Page<ResidentAgencyVO> page = DataUtils.listToPage(list, pageable);
+        return page;
+    }
+}