Преглед изворни кода

add:获取测评机构列表

xuexiaobo пре 6 година
родитељ
комит
32a3661fc7

+ 8 - 0
site/src/main/java/com/mooctest/crowd/site/controller/AgencyController.java

@@ -5,12 +5,15 @@ import com.mooctest.crowd.site.command.AgencyUpdateCommand;
 import com.mooctest.crowd.site.command.ApplyAgencyAuthCommand;
 import com.mooctest.crowd.site.command.GenerateAgencyCommand;
 import com.mooctest.crowd.site.data.dto.UserDTO;
+import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
 import com.mooctest.crowd.site.service.AgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author: Diors.Po
  * @Email: 171256175@qq.com
@@ -73,4 +76,9 @@ public class AgencyController {
             throw new BaseException(result.getFieldError().getDefaultMessage());
         return agencyService.updateAgencyInfo(userId, command);
     }
+
+    @RequestMapping(value = "/agency/list", method = RequestMethod.GET)
+    public List<EvolutionAgencyVO> getAgencyList(){
+        return agencyService.getAgencyList();
+    }
 }

+ 1 - 0
site/src/main/java/com/mooctest/crowd/site/data/vo/EvolutionAgencyVO.java

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class EvolutionAgencyVO {
+    private Long id;
     private String logo;
     private String name;
     private Double allTaskPrice;

+ 6 - 1
site/src/main/java/com/mooctest/crowd/site/mediator/ViewMediator.java

@@ -1,12 +1,15 @@
 package com.mooctest.crowd.site.mediator;
 
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
 import com.mooctest.crowd.domain.domainobject.User;
 import com.mooctest.crowd.site.command.*;
 import com.mooctest.crowd.site.data.dto.*;
 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.data.vo.AgencyVO;
+import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
 import com.mooctest.crowd.site.data.vo.RegionalManagerVO;
 
 import java.util.List;
@@ -35,6 +38,8 @@ public interface ViewMediator {
 
     UserDTO renderUser(User user);
 
-    List<RegionalManagerVO> renderRegionManager();
+    List<RegionalManagerVO> renderRegionManagerList();
+
+    List<EvolutionAgencyVO> renderAgencyList();
 
 }

+ 13 - 1
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -196,7 +196,7 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public List<RegionalManagerVO> renderRegionManager() {
+    public List<RegionalManagerVO> renderRegionManagerList() {
         List<RegionalManagerVO> regionalManagerVOList = new ArrayList<>();
         regionalManagerDao.findAll().forEach(regionalManagerPO -> {
             RegionalManagerVO regionalManagerVO = new RegionalManagerVO();
@@ -207,4 +207,16 @@ public class WebMediatorImpl implements ViewMediator {
         List<RegionalManagerVO> results = regionalManagerVOList.stream().distinct().collect(Collectors.toList());
         return results;
     }
+
+    @Override
+    public List<EvolutionAgencyVO> renderAgencyList() {
+        List<EvolutionAgencyVO> agencyList = new ArrayList<>();
+        agencyDao.findAll().forEach(evaluationAgencyPO -> {
+            EvolutionAgencyVO agencyVO = new EvolutionAgencyVO();
+            agencyVO.setId(evaluationAgencyPO.getUserId());
+            agencyVO.setName(evaluationAgencyPO.getEvaluationAgencyName());
+            agencyList.add(agencyVO);
+        });
+        return agencyList;
+    }
 }

+ 5 - 0
site/src/main/java/com/mooctest/crowd/site/service/AgencyService.java

@@ -4,6 +4,9 @@ import com.mooctest.crowd.site.command.AgencyUpdateCommand;
 import com.mooctest.crowd.site.command.ApplyAgencyAuthCommand;
 import com.mooctest.crowd.site.command.GenerateAgencyCommand;
 import com.mooctest.crowd.site.data.dto.UserDTO;
+import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
+
+import java.util.List;
 
 /**
  * @author: Diors.Po
@@ -18,4 +21,6 @@ public interface AgencyService {
     UserDTO updateAgencyStatus(Long userId, Integer status);
 
     UserDTO updateAgencyInfo(Long userId, AgencyUpdateCommand command);
+
+    List<EvolutionAgencyVO> getAgencyList();
 }

+ 3 - 0
site/src/main/java/com/mooctest/crowd/site/service/CrowdTaskService.java

@@ -3,6 +3,9 @@ package com.mooctest.crowd.site.service;
 import com.mooctest.crowd.site.command.CrowdTestTaskCommand;
 import com.mooctest.crowd.site.data.dto.TaskDetailsDTO;
 import com.mooctest.crowd.site.data.dto.TaskSquareDTO;
+import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
+
+import java.util.List;
 
 /**
  * @author: Diors.Po

+ 6 - 0
site/src/main/java/com/mooctest/crowd/site/service/impl/AgencyServiceImpl.java

@@ -12,6 +12,7 @@ import com.mooctest.crowd.site.command.ApplyAgencyAuthCommand;
 import com.mooctest.crowd.site.command.GenerateAgencyCommand;
 import com.mooctest.crowd.site.data.dto.UserDTO;
 import com.mooctest.crowd.site.data.vo.AgencyVO;
+import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
 import com.mooctest.crowd.site.data.vo.UserVO;
 import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.AgencyService;
@@ -101,4 +102,9 @@ public class AgencyServiceImpl implements AgencyService {
         user.setEvaluationAgency(agency);
         return mediator.renderUser(userRepo.saveUser(user));
     }
+
+    @Override
+    public List<EvolutionAgencyVO> getAgencyList() {
+        return mediator.renderAgencyList();
+    }
 }

+ 1 - 1
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdProjectServiceImpl.java

@@ -170,7 +170,7 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 
     @Override
     public List<RegionalManagerVO> getRegionalManagerList() {
-        return viewMediator.renderRegionManager();
+        return viewMediator.renderRegionManagerList();
     }
 
     private List<CrowdTestProject> transferExcel2Projects(MultipartFile file){

+ 5 - 0
site/src/main/java/com/mooctest/crowd/site/service/impl/CrowdTaskServiceImpl.java

@@ -14,6 +14,8 @@ import com.mooctest.crowd.site.data.dto.TaskSquareDTO;
 import com.mooctest.crowd.site.data.enums.ProjectType;
 import com.mooctest.crowd.site.data.vo.CrowdReportVO;
 import com.mooctest.crowd.site.data.vo.CrowdTaskVO;
+import com.mooctest.crowd.site.data.vo.EvolutionAgencyVO;
+import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.CrowdTaskService;
 import com.mooctest.crowd.site.util.GenerateFlowCodeUtil;
 import org.springframework.beans.BeanUtils;
@@ -39,6 +41,9 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
     @Autowired
     CrowdTestTaskDao taskDao;
 
+    @Autowired
+    private ViewMediator viewMediator;
+
 //    @Autowired
 //    GenerateFlowCodeUtil codeUtil;