Merge branch 'feature-V2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-backend into feature-V2.0

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

@@ -1,13 +1,17 @@
 package com.mooctest.crowd.domain.dao;
 
 import com.mooctest.crowd.domain.model.BankLogoPO;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import javax.transaction.Transactional;
+import java.util.List;
 import java.util.Optional;
 
 @Transactional
 public interface BankLogoDao extends CrudRepository<BankLogoPO, Long>{
 
     Optional<BankLogoPO> findByCode(String code);
+
+    List<BankLogoPO> findAll();
 }

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

@@ -67,4 +67,9 @@ public class PersonalDataController {
     public BankCardDTO deleteBankCard(@PathVariable("id") long id, @PathVariable("userId") long userId){
         return  personalDataService.deleteBankCard(id,userId);
     }
+
+    @RequestMapping(value = "/banktype", method = RequestMethod.GET)
+    public BankCardDTO displayBankType(){
+        return  personalDataService.getBankType();
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.mooctest.crowd.site.data.dto;
 
 import com.mooctest.crowd.site.data.vo.BankCardVO;
+import com.mooctest.crowd.site.data.vo.BankLogoVO;
 import lombok.Data;
 
 import java.util.List;
@@ -9,4 +10,5 @@ import java.util.List;
 public class BankCardDTO {
     private BankCardVO bankCardVO;
     private List<BankCardVO> bankCardVOList;
+    private List<BankLogoVO>  bankLogoVOList;
 }

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

@@ -4,16 +4,10 @@ import com.mooctest.crowd.domain.domainobject.BankLogo;
 import lombok.Data;
 
 
-
 @Data
 public class BankLogoVO {
+    private Long id;
     private String name;
     private  String logoUrl;
     private String code;
-
-    public BankLogoVO(BankLogo bankLogo){
-        code = bankLogo.getCode();
-        name = bankLogo.getName();
-        logoUrl=bankLogo.getLogoUrl();
-    }
 }

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

@@ -99,4 +99,6 @@ public interface ViewMediator {
     List<ResourceVO>  getSearchResource(String name);
 
     QualificationDTO getOne(long id);
+
+    BankCardDTO getBankType();
 }

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

@@ -1189,6 +1189,23 @@ public class WebMediatorImpl implements ViewMediator {
         return qualificationDTO;
 }
 
+    @Override
+    public BankCardDTO getBankType() {
+        BankCardDTO bankCardDTO = new BankCardDTO();
+        List<BankLogoVO> bankLogoVOList = new ArrayList<>();
+        bankLogoDao.findAll().forEach(bankLogoPO -> {
+            BankLogoVO bankLogoVO = new BankLogoVO();
+            bankLogoVO.setId(bankLogoPO.getId());
+            bankLogoVO.setName(bankLogoPO.getName());
+            bankLogoVO.setLogoUrl(bankLogoPO.getLogoUrl());
+            bankLogoVO.setCode(bankLogoPO.getCode());
+            bankLogoVOList.add(bankLogoVO);
+        });
+        List<BankLogoVO> results = bankLogoVOList.stream().distinct().collect(Collectors.toList());
+        bankCardDTO.setBankLogoVOList(results);
+        return bankCardDTO;
+    }
+
     private ProjectOperationControl initProjectPermission(CrowdTestProject project, User user) {
         ProjectOperationControl operationControl = new ProjectOperationControl();
         if (user == null)

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

@@ -29,4 +29,6 @@ public interface PersonalDataService {
     BankCardDTO deleteBankCard(long id,long userId);
 
     QualificationDTO getOne(long id);
+
+    BankCardDTO getBankType();
 }

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

@@ -67,4 +67,9 @@ public class PersonalDataServiceImpl implements PersonalDataService {
     public QualificationDTO getOne(long id) {
         return viewMediator.getOne(id);
     }
+
+    @Override
+    public BankCardDTO getBankType() {
+        return viewMediator.getBankType();
+    }
 }