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

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

@@ -0,0 +1,44 @@
+package com.mooctest.crowd.site.controller;
+
+import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
+import com.mooctest.crowd.site.data.dto.CrowdTestSquareIndexDTO;
+import com.mooctest.crowd.site.service.CrowdProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author:xx
+ * @date:2020/6/20
+ * @description:
+ */
+
+@RestController
+@RequestMapping("/api/square")
+public class CrowTestSquareController {
+    @Autowired
+    private CrowdProjectService crowdProjectService;
+
+
+    /**
+     * 获取众测广场首页所有的数据 包装到CrowdTestSquareIndexDTO里面
+     *
+     * @return
+     */
+
+    @GetMapping("/list")
+    public CrowdTestSquareIndexDTO getAll() {
+        CrowdTestSquareIndexDTO crowdTestSquareIndexDTO = new CrowdTestSquareIndexDTO();
+        List<CrowdTestProject> list = crowdProjectService.getAll();
+        crowdTestSquareIndexDTO.setCrowdTestProjectPOS(list);
+        return crowdTestSquareIndexDTO;
+
+
+    }
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.mooctest.crowd.site.data.dto;
+
+import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
+import com.mooctest.crowd.domain.model.CrowdTestTaskPO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author:xx
+ * @date:2020/6/20
+ * @description:众测广场首页所有数据
+ */
+
+
+@Data
+public class CrowdTestSquareIndexDTO {
+
+    private List<CrowdTestProject> crowdTestProjectPOS;
+
+
+    private  List<CrowdTestTask> crowdTestTaskPOS;
+}

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

@@ -1,6 +1,7 @@
 package com.mooctest.crowd.site.service;
 
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 import com.mooctest.crowd.site.command.CrowdTestProjectCommand;
 import com.mooctest.crowd.site.command.GenerateProjectCommand;
 import com.mooctest.crowd.site.data.dto.ProjectDetailsDTO;
@@ -15,6 +16,7 @@ import java.util.List;
  * @date 2019-07-29 10:49
  */
 public interface CrowdProjectService {
+    List<CrowdTestProject> getAll();
     ProjectDetailsDTO getProjectDetails(String projectCode, Long userId);
 
     ProjectDetailsDTO createCrowdProject(CrowdTestProjectCommand command);

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

@@ -7,6 +7,7 @@ import com.mooctest.crowd.domain.exception.BadRequestException;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.domain.exception.Excel2ProjectException;
 import com.mooctest.crowd.domain.factory.CrowdTestProjectFactory;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
 import com.mooctest.crowd.domain.repository.UserRepo;
 import com.mooctest.crowd.site.command.CrowdTestProjectCommand;
@@ -57,6 +58,11 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
 
 
     @Override
+    public List<CrowdTestProject> getAll() {
+          return projectRepo.getAllCrowdTestProject();
+    }
+
+    @Override
     public ProjectDetailsDTO getProjectDetails(String projectCode, Long userId) {
         if (userId==null)
             return viewMediator.renderProjectDetails(projectRepo.getByProjectCode(projectCode), null);