删除部分无用的接口和代码

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

@@ -311,12 +311,6 @@ public class CrowdTestProjectRepo implements ICrowdTestProjectRepo {
         return crowdTestProjectDao.findHotProjectCardLimitCount(projectCount).stream().map(crowdTestProjectPO -> Converter.convert(CrowdTestProject.class, crowdTestProjectPO)).collect(Collectors.toList());
     }
 
-//    @Override
-//    public void removeCrowdTestProject(String crowdTestProjectCode){
-//        CrowdTestProject crowdTestProject = getByProjectCode(crowdTestProjectCode);
-//        crowdTestProjectDao.delete(Converter.convert(CrowdTestProjectPO.class, crowdTestProject));
-//    }
-
     public void removeCrowdTestProjectList(List<CrowdTestProject> crowdTestProjectList) {
         List<CrowdTestProjectPO> crowdTestProjectPOList = new ArrayList<>();
         for (CrowdTestProject crowdTestProject : crowdTestProjectList) {

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

@@ -40,25 +40,6 @@ public interface ICrowdTestProjectRepo {
 
     List<CrowdTestProject> getByProject();
 
-//    void removeCrowdTestProject(String crowdTestProjectCode) throws CrowdTestProjectNotExistException;
-
-//    CrowdTestProject saveCreateCrowdTestProject(CrowdTestProject crowdTestProject);
-//
-//    boolean saveCreateCrowdTestTask(String crowdTestProjectCode, CrowdTestTask crowdTestTask);
-//
-//    boolean saveCreateCrowdTestReport(String crowdTestProjectCode, String crowdTestTaskCode, CrowdTestReport crowdTestReport);
-
-
-//    void deleteByProjectId(Long projectId);
-
-//    List<CrowdTestProject> getByIDList(String[] ids);
-//
-//    boolean removeCrowdTestProject(CrowdTestProject crowdTestProject) throws CrowdTestProjectNotExistException;
-//
-//    CrowdTestProject updateCrowdTestProject(CrowdTestProject crowdTestProject) throws CrowdTestProjectNotExistException;
-//
-//    CrowdTestProject updateCrowdTestProjectStatus(Long id, String status) throws CrowdTestProjectNotExistException;
-
     EndPoint getEndPoint(String taskCode);
 
     EndPoint addEndPoint(String taskCode,EndPoint endPoint);

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

@@ -6,7 +6,6 @@ import com.mooctest.crowd.domain.domainobject.User;
 import com.mooctest.crowd.domain.exception.AccountNotExistException;
 import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.exception.PasswordErrorException;
-import com.mooctest.crowd.site.command.ApplyEnterpriseAuthCommand;
 import com.mooctest.crowd.site.command.ApplyPersonalAuthCommand;
 import com.mooctest.crowd.site.command.LoginCommand;
 import com.mooctest.crowd.site.command.RegisterCommand;
@@ -23,19 +22,13 @@ import java.util.Map;
  * @Date: 2019.7.16 20:25
  */
 public interface ViewMediator {
-    List<CrowdTestProjectVO> crowdTestProjects();
-
-    void saveEnterpriseRole(User user, ApplyEnterpriseAuthCommand applyEnterpriseAuthCommand);
 
     void saveUserRole(User user, ApplyPersonalAuthCommand command);
 
     List<UserVO> renderMoreUser(Pageable pageable, String keyword);
 
-
     List<CrowdTaskVO> findMoreHotTasks();
 
-    List<CrowdTestProjectVO> findMoreHotProjects();
-
     EnterpriseAuthVO getEnterpriseAuthByUserId(Long userId);
 
     PersonalAuthVO getByUserId(Long userId);
@@ -62,17 +55,12 @@ public interface ViewMediator {
     CrowdTestProject changeFieldAndApplicationAndTestType(CrowdTestProject project, Map<String, String> applicationMap
             , Map<String, String> fieldMap, Map<String, String> testMap);
 
-    CrowdTestTask changeFieldAndApplicationAndTestTypeByTask(CrowdTestTask task, Map<String, String> applicationMap
-            , Map<String, String> fieldMap, Map<String, String> testMap);
-
     CrowdTestTask changeTypeByProjectAndTask(CrowdTestProject project, CrowdTestTask task, Map<String, String> applicationMap
             , Map<String, String> fieldMap, Map<String, String> testMap);
 
     CrowdTaskVO changeTypeByProjectAndTaskVO(CrowdTestProject project, CrowdTaskVO task, Map<String, String> applicationMap
             , Map<String, String> fieldMap, Map<String, String> testMap);
 
-    CrowdTestTask changeTypeByProjectAndTask(CrowdTestProject project, CrowdTestTask task);
-
     ProjectDetailsDTO renderProjectDetails(CrowdTestProject project, Long userId);
 
     ReportDetailsDTO renderTaskReportDetails(String projectCode, String taskCode, String reportCode, Long userId);
@@ -85,8 +73,6 @@ public interface ViewMediator {
 
     UserDTO renderUser(User user);
 
-    List<RegionalManagerVO> renderRegionManagerList();
-
     List<EvaluationAgencyVO> renderAgencyList();
 
     List<TestUserOrAgencyVO> renderAgencyAndTestUserList();
@@ -143,8 +129,6 @@ public interface ViewMediator {
 
     BankCardDTO getBankType();
 
-    List<CrowdTestProjectVO> crowdTestProjectsWaitingAccept();
-
     List<UserTaskCountVO> getCount();
 
     void  jumpPublicTesting(String projectCode, String taskCode, Long userId);

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

@@ -171,45 +171,6 @@ public class WebMediatorImpl implements ViewMediator {
     private String indexResourceCount;
 
     @Override
-    public List<CrowdTestProjectVO> crowdTestProjects() {
-        List<CrowdTestProjectVO> resultList = new ArrayList<>();
-        resultList.addAll(projectDao.findAll().stream().map(crowdTestProjectPO -> {
-            CrowdTestProject crowdTestProject = new CrowdTestProject();
-            BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
-            return new CrowdTestProjectVO(crowdTestProject);
-        }).collect(Collectors.toList()));
-        return resultList;
-    }
-
-    @Override
-    public void saveEnterpriseRole(User user, ApplyEnterpriseAuthCommand applyEnterpriseAuthCommand) {
-        //如果是研发机构那么能发包
-        if(applyEnterpriseAuthCommand.getRoleList().contains(0) && applyEnterpriseAuthCommand.getRoleList().contains(1)){
-            UserToRolePO u2r = new UserToRolePO();
-            u2r.setUserId(user.getId());
-            u2r.setRoleId(8L);
-            userToRoleDao.save(u2r);
-            UserToRolePO u2rl = new UserToRolePO();
-            u2rl.setUserId(user.getId());
-            u2rl.setRoleId(2L);
-            userToRoleDao.save(u2rl);
-
-        }
-        else if(applyEnterpriseAuthCommand.getRoleList().contains(1)){
-            UserToRolePO u2r = new UserToRolePO();
-            u2r.setUserId(user.getId());
-            u2r.setRoleId(2L);
-            userToRoleDao.save(u2r);
-        }
-        else if(applyEnterpriseAuthCommand.getRoleList().contains(0)){
-            UserToRolePO u2r = new UserToRolePO();
-            u2r.setUserId(user.getId());
-            u2r.setRoleId(8L);
-            userToRoleDao.save(u2r);
-        }
-    }
-
-    @Override
     public void saveUserRole(User user, ApplyPersonalAuthCommand command) {
         if (command.getRoleList().size() == 0 || command.getRoleList() == null) {
             throw new BaseException("请选择成为发包或者接包用户");
@@ -719,18 +680,6 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public CrowdTestTask changeFieldAndApplicationAndTestTypeByTask(CrowdTestTask task, Map<String, String> applicationMap
-            , Map<String, String> fieldMap, Map<String, String> testMap) {
-        // 领域类型值的转换
-        task.setFieldType(fieldMap.get(task.getFieldType()));
-        // 应用类型值的转换
-        task.setApplicationType(applicationMap.get(task.getApplicationType()));
-        // 测试类型值的转换
-        task.setType(testMap.get(task.getType()));
-        return task;
-    }
-
-    @Override
     public CrowdTestTask changeTypeByProjectAndTask(CrowdTestProject project, CrowdTestTask task, Map<String, String> applicationMap
             , Map<String, String> fieldMap, Map<String, String> testMap) {
         // 获取项目的领域、应用类型赋值给任务
@@ -761,26 +710,6 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public CrowdTestTask changeTypeByProjectAndTask(CrowdTestProject project, CrowdTestTask task) {
-        // 获取领域、应用、测试类型code 和 name 的map
-        Map<String, String> fieldMap = commonRepo.getFieldCodeNameMap();
-        Map<String, String> applicationMap = commonRepo.getApplicationCodeNameMap();
-        Map<String, String> testMap = commonRepo.getTypeCodeNameMap();
-
-        // 获取项目的领域、应用类型赋值给任务
-        task.setFieldType(project.getFieldType());
-        task.setApplicationType(project.getApplicationType());
-        // 领域类型值的转换
-        task.setFieldType(fieldMap.get(task.getFieldType()));
-        // 应用类型值的转换
-        task.setApplicationType(applicationMap.get(task.getApplicationType()));
-        // 测试类型值的转换
-        task.setType(testMap.get(task.getType()));
-        return task;
-    }
-
-
-    @Override
     public TaskSquareDTO renderTaskSquare() {
         Map<String, String> testMap = commonRepo.getTypeCodeNameMap();
 
@@ -1078,19 +1007,6 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public List<RegionalManagerVO> renderRegionManagerList() {
-        List<RegionalManagerVO> regionalManagerVOList = new ArrayList<>();
-        regionalManagerToRegionalDao.findAll().forEach(regionalManagerPO -> {
-            RegionalManagerVO regionalManagerVO = new RegionalManagerVO();
-            regionalManagerVO.setId(regionalManagerPO.getUserId());
-            regionalManagerVO.setName(userDao.findById(regionalManagerPO.getUserId()).get().getName());
-            regionalManagerVOList.add(regionalManagerVO);
-        });
-        List<RegionalManagerVO> results = regionalManagerVOList.stream().distinct().collect(Collectors.toList());
-        return results;
-    }
-
-    @Override
     public List<EvaluationAgencyVO> renderAgencyList() {
         List<EvaluationAgencyVO> agencyList = new ArrayList<>();
         evaluationAgencyRepo.findAll().forEach(evaluationAgency -> {
@@ -1219,24 +1135,6 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public List<CrowdTestProjectVO> crowdTestProjectsWaitingAccept() {
-        return projectDao.findAll().stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus() == CrowdTestProjectStatus.HAS_RELEASED
-            && crowdTestProjectPO.getDeadTime().getTime() > System.currentTimeMillis()).map(crowdTestProjectPO -> {
-            CrowdTestProject crowdTestProject = new CrowdTestProject();
-            BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
-            // 应用类型值的转换
-            Optional<ApplicationTypePO> applicationTypePO = applicationTypeDao.findByCode(crowdTestProject.getApplicationType());
-            if (applicationTypePO.isPresent()) {
-                crowdTestProject.setApplicationType(applicationTypePO.get().getName());
-            } else {
-                throw new HttpBadRequestException("应用类型有误");
-            }
-            return new CrowdTestProjectVO(crowdTestProject);
-
-        }).collect(Collectors.toList());
-    }
-
-    @Override
     public List<UserTaskCountVO> getCount() {
         List<RankCountInfo> rankCountInfos = taskToUserDao.findTotalCountOfUser();
         for(int i=0;i<rankCountInfos.size();i++){