Merge branch 'Dev' into 'Test'

Dev

See merge request crowd-2019/crowd-test-service-backend!33

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

@@ -2,11 +2,11 @@ package com.mooctest.crowd.domain.repository;
 
 import com.mooctest.crowd.domain.dao.AgencyAbilityDao;
 import com.mooctest.crowd.domain.dao.AgencyResourceDao;
-import com.mooctest.crowd.domain.domainobject.DeletedStatus;
-import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
-import com.mooctest.crowd.domain.domainobject.EvaluationAgencyResource;
+import com.mooctest.crowd.domain.dao.EvaluationAgencyDao;
+import com.mooctest.crowd.domain.domainobject.*;
 import com.mooctest.crowd.domain.exception.EvaluationAgencyResourceNotExist;
 import com.mooctest.crowd.domain.model.EvaluationAgencyAbilityPO;
+import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
 import com.mooctest.crowd.domain.model.EvaluationAgencyResourcePO;
 import com.mooctest.crowd.domain.util.Converter;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +27,20 @@ public class EvaluationAgencyRepo implements IEvaluationAgencyRepo {
 
     @Autowired
     private AgencyAbilityDao agencyAbilityDao;
+    
+    @Autowired
+    private EvaluationAgencyDao evaluationAgencyDao;
+
+    @Override
+    public EvaluationAgency findAgencyById(Long id){
+        System.out.println(id);
+        Optional<EvaluationAgencyPO> evaluationAgencyPO = evaluationAgencyDao.findById(id);
+        if(!evaluationAgencyPO.isPresent()){
+            throw new EvaluationAgencyResourceNotExist("测评信息不存在");
+        }else{
+            return Converter.convert(EvaluationAgency.class, evaluationAgencyPO.get());
+        }
+    }
 
     @Override
     public EvaluationAgencyResource findById(Long id){
@@ -72,6 +86,12 @@ public class EvaluationAgencyRepo implements IEvaluationAgencyRepo {
         return Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO);
     }
 
+    @Override
+    public List<EvaluationAgencyAbility> findEvaluationAgencyAbility(Long evaluationAgencyId){
+        List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = agencyAbilityDao.findByEvaluationAgencyIdAndIsDeleted(evaluationAgencyId, DeletedStatus.isNotDeleted);
+        return evaluationAgencyAbilityPOList.stream().map(evaluationAgencyAbilityPO -> Converter.convert(EvaluationAgencyAbility.class, evaluationAgencyAbilityPO)).collect(Collectors.toList());
+    }
+
 //    public List<EvaluationAgencyAbility> saveAllAbility(List<EvaluationAgencyAbility> abilityList){
 //        List<EvaluationAgencyAbilityPO> evaluationAgencyAbilityPOList = agencyAbilityDao.saveAll(abilityList.stream().map(source -> Converter.convert(EvaluationAgencyAbilityPO.class, source)).collect(Collectors.toList()));
 //        return evaluationAgencyAbilityPOList.stream().map(abilityPO -> Converter.convert(EvaluationAgencyAbility.class, abilityPO)).collect(Collectors.toList());

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

@@ -1,5 +1,6 @@
 package com.mooctest.crowd.domain.repository;
 
+import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyResource;
 
@@ -11,6 +12,8 @@ import java.util.List;
  */
 public interface IEvaluationAgencyRepo {
 
+    EvaluationAgency findAgencyById(Long id);
+
     EvaluationAgencyResource findById(Long id);
 
     List<EvaluationAgencyResource> findByEvaluationAgencyId(Long evaluationAgencyId);
@@ -21,5 +24,7 @@ public interface IEvaluationAgencyRepo {
 
     EvaluationAgencyAbility saveEvaluationAgencyAbility(EvaluationAgencyAbility EvaluationAgencyAbility);
 
+    List<EvaluationAgencyAbility> findEvaluationAgencyAbility(Long evaluationAgencyId);
+
     void moveEvaluationAgencyAbility(List<EvaluationAgencyAbility> evaluationAgencyAbilityList);
 }

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

@@ -80,6 +80,7 @@ public class UserController {
             throw new UnauthorizedException("没有权限对他人账号进行操作！");
         if (result.hasErrors())
             throw new BaseException(result.getFieldError().getDefaultMessage());
+
         return userService.applyPersonalAuth(userId, command);
     }
 

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

@@ -1,7 +1,6 @@
 package com.mooctest.crowd.site.data.dto;
 
 import com.mooctest.crowd.site.data.vo.*;
-import com.mooctest.crowd.domain.domainobject.Permission;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -1,6 +1,5 @@
 package com.mooctest.crowd.site.data.vo;
 
-import com.mooctest.crowd.domain.domainobject.AuthenticationStatus;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgency;
 import com.mooctest.crowd.domain.domainobject.EvaluationAgencyAbility;
 import lombok.Data;
@@ -33,6 +32,8 @@ public class AgencyVO {
     private Timestamp expireTime;
     private Timestamp createTime;
     private StatusVO authStatus;
+    private Timestamp applyTime;
+
 
     public AgencyVO(EvaluationAgency agency){
         BeanUtils.copyProperties(agency, this, "evaluationAgencyResourceList", "evaluationAgencyAbilityList");

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

@@ -11,8 +11,10 @@ import com.mooctest.crowd.domain.model.CrowdTestTaskPO;
 import com.mooctest.crowd.domain.model.EvaluationAgencyPO;
 import com.mooctest.crowd.domain.model.UserPO;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
+import com.mooctest.crowd.domain.repository.EvaluationAgencyRepo;
 import com.mooctest.crowd.domain.repository.UserRepo;
-import com.mooctest.crowd.site.command.*;
+import com.mooctest.crowd.site.command.LoginCommand;
+import com.mooctest.crowd.site.command.RegisterCommand;
 import com.mooctest.crowd.site.data.ProjectOperationControl;
 import com.mooctest.crowd.site.data.TaskOperationControl;
 import com.mooctest.crowd.site.data.dto.*;
@@ -21,11 +23,11 @@ import com.mooctest.crowd.site.mediator.ViewMediator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.List;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -44,6 +46,9 @@ public class WebMediatorImpl implements ViewMediator {
     private UserRepo userRepo;
 
     @Autowired
+    private EvaluationAgencyRepo evaluationAgencyRepo;
+
+    @Autowired
     private CrowdTestTaskDao taskDao;
 
     @Autowired
@@ -67,6 +72,9 @@ public class WebMediatorImpl implements ViewMediator {
     @Autowired
     private EnterpriseAuthenticationDao enterpriseAuthenticationDao;
 
+    @Value("${agency}")
+    private String agencyId;
+
     @Override
     public UserDTO loginByMobileAndPwd(LoginCommand cmd) {
         return null;
@@ -351,13 +359,14 @@ public class WebMediatorImpl implements ViewMediator {
     @Override
     public List<EvolutionAgencyVO> renderAgencyList() {
         List<EvolutionAgencyVO> agencyList = new ArrayList<>();
+        EvaluationAgency agencyTemplate = evaluationAgencyRepo.findAgencyById(Long.parseLong(agencyId));
         agencyDao.findAll().forEach(evaluationAgencyPO -> {
             EvolutionAgencyVO agencyVO = new EvolutionAgencyVO();
             agencyVO.setId(evaluationAgencyPO.getUserId());
             agencyVO.setName(evaluationAgencyPO.getEvaluationAgencyName());
             agencyList.add(agencyVO);
         });
-        return agencyList;
+        return agencyList.stream().filter(agency -> !agency.getName().equals(agencyTemplate.getEvaluationAgencyName())).collect(Collectors.toList());
     }
 
     @Override

site/src/main/resources/application.yml

@@ -1,5 +1,6 @@
 spring:
   profiles:
+#    active: dev
     active: online
   cache:
     guava:
@@ -53,6 +54,8 @@ oss:
 #user:
 #  service:
 #    baseUrl: http://111.231.143.6:8081
+
+agency: 7
 ---
 spring:
   profiles: dev