fix conflict

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

@@ -27,6 +27,7 @@ public interface CrowdTestProjectDao extends CrudRepository<CrowdTestProjectPO,
     //    @Override
 //    Optional<CrowdTestProjectPO> findById(Long id);
 
+
     List<CrowdTestProjectPO> findByNameLike(String name);
 
     @Query(value = "SELECT * FROM crowd_test_project ORDER BY CTP_CREATE_TIME DESC", nativeQuery = true)

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

@@ -1,5 +1,7 @@
 package com.mooctest.crowd.site.controller;
 
+import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.domainobject.CrowdTestProjectStatus;
 import com.mooctest.crowd.site.data.dto.CrowdTestSquareIndexDTO;
 import com.mooctest.crowd.site.data.response.ResponseVO;
 import com.mooctest.crowd.site.data.response.ServerCode;
@@ -46,7 +48,7 @@ public class CrowTestSquareController extends BaseSearchController {
      * @return
      */
     @GetMapping("/list")
-    public ResponseVO getAll(){
+    public ResponseVO getAll() {
         CrowdTestSquareIndexDTO crowdTestSquareIndexDTO = new CrowdTestSquareIndexDTO();
         List<CrowdTestProjectVO> list = crowdProjectService.findIndexProject();
         List<CrowdTaskVO> crowdTestTasks = crowdTaskService.findAll();

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

@@ -23,23 +23,4 @@ public class CrowdTestSquareIndexDTO {
     private List<CrowdTestProjectVO> hotCrowdTestProjectVOs;
     //热门任务
     private List<CrowdTaskVO> hotCrowdTaskVOs;
-
-
-    /**
-     * 初始化热门任务 ，热门项目
-     */
-    public void initHotTaskAndProject(){
-        List<CrowdTestProjectVO> projectVOS = this.crowdTestProjectVOs;
-        this.crowdTestProjectVOs = projectVOS.size() <= 6 ? projectVOS : projectVOS.subList(0, 6);
-        
-
-        //根据参与人数和创建时间进行排序
-        List<CrowdTestProjectVO> list1 = projectVOS.stream().sorted(Comparator.comparing(CrowdTestProjectVO::getJoinCount).reversed()).collect(Collectors.toList());
-        //截取前七条
-        this.hotCrowdTestProjectVOs = list1.size() <= 7 ? list1 :list1.subList(0, 7);
-        List<CrowdTaskVO> tasklist1 = crowdTestTaskVOS.size() <= 6 ? crowdTestTaskVOS : crowdTestTaskVOS.subList(0, 6);
-        List<CrowdTaskVO> tasklist2 = crowdTestTaskVOS.stream().sorted(Comparator.comparing(CrowdTaskVO::getAcceptedCount).reversed()).collect(Collectors.toList());
-        this.hotCrowdTaskVOs = tasklist2.size() <= 7 ? tasklist2 : tasklist2.subList(0, 7);
-        this.crowdTestTaskVOS = tasklist1;
-    }
 }

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

@@ -23,6 +23,7 @@ import com.mooctest.crowd.site.data.enums.RoleType;
 import com.mooctest.crowd.site.data.vo.*;
 import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.ThemeStatusService;
+import com.mooctest.crowd.site.service.ThemeStatusTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.codehaus.jettison.json.JSONException;
 import org.jetbrains.annotations.NotNull;
@@ -124,6 +125,9 @@ public class WebMediatorImpl implements ViewMediator {
     @Autowired
     private ThemeStatusService themeStatusService;
 
+    @Autowired
+    private ThemeStatusTaskService themeStatusTaskService;
+
 
     @Override
     public List<CrowdTestProjectVO> crowdTestProjects() {
@@ -623,7 +627,6 @@ public class WebMediatorImpl implements ViewMediator {
                             if (crowdTestTaskPO != null) {
                                 CrowdTestTask task = new CrowdTestTask();
                                 BeanUtils.copyProperties(crowdTestTaskPO, task);
-
                                 // 测试类型的转换
                                 Optional<TestTypePO> testTypePO = testTypeDao.findByCode(task.getType());
                                 if (!testTypePO.isPresent()) {
@@ -1072,11 +1075,12 @@ public class WebMediatorImpl implements ViewMediator {
     }
 
     @Override
-    public List<CrowdTestProjectVO> AllByPage() {
+    public List<CrowdTestProjectVO> AllByPage(){
         List<CrowdTestProjectVO> authingList = new ArrayList<>();
-        authingList.addAll(projectDao.findAll().stream().map(crowdTestProjectPO -> {
+        authingList.addAll(projectDao.findAll().stream().map(crowdTestProjectPO ->{
             CrowdTestProject crowdTestProject = new CrowdTestProject();
             BeanUtils.copyProperties(crowdTestProjectPO, crowdTestProject);
+            themeStatusService.updateStatus(crowdTestProject);
             return new CrowdTestProjectVO(crowdTestProject);
         }).collect(Collectors.toList()));
         return authingList;

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

@@ -1,5 +1,6 @@
 package com.mooctest.crowd.site.service;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 
 
 public interface ThemeStatusService {

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

@@ -0,0 +1,7 @@
+package com.mooctest.crowd.site.service;
+import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
+
+
+public interface ThemeStatusTaskService {
+    Integer updateStatus(CrowdTestTask crowdTestTask);
+}

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

@@ -26,6 +26,7 @@ import com.mooctest.crowd.site.mediator.OperationMediator;
 import com.mooctest.crowd.site.mediator.ViewMediator;
 import com.mooctest.crowd.site.service.CrowdProjectService;
 import com.mooctest.crowd.site.service.ThemeSchedulerService;
+import com.mooctest.crowd.site.service.ThemeStatusService;
 import com.mooctest.crowd.site.util.GenerateFlowCodeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -56,6 +57,8 @@ import java.util.stream.Collectors;
 @Service
 public class CrowdProjectServiceImpl implements CrowdProjectService {
     @Autowired
+    private ThemeStatusService themeStatusService;
+    @Autowired
     private  CrowdTestProjectDao projectDao;
     @Autowired
     private RoleDao roleDao;
@@ -129,8 +132,10 @@ public class CrowdProjectServiceImpl implements CrowdProjectService {
     @Override
     public List<CrowdTestProjectVO> findByNameLike(String name) {
         if (name == null || name.trim().equals("")){
+            System.out.println("进来进来");
             return viewMediator.AllByPage();
         }
+
         return viewMediator.findByNameLike(name);
 
     }

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

@@ -39,7 +39,7 @@ public class CrowdTestSquareServiceImpl implements CrowdTestSquareService {
     private CrowdTaskService crowdTaskService;
 
     @Override
-    public ResponseVO findByNameLike(SearchConditionVO searchConditionVO) {
+    public ResponseVO findByNameLike(SearchConditionVO searchConditionVO){
         Map<String, String> extraCondition = searchConditionVO.getColumnFilters() == null ? new HashMap<>() : this.getExtraCondition(searchConditionVO);
         Pageable pageable = this.getPageable(searchConditionVO);
         String keyword = searchConditionVO.getKeyword();

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

@@ -2,16 +2,26 @@ package com.mooctest.crowd.site.service.impl;
 
 import com.mooctest.crowd.domain.dao.CrowdTestProjectDao;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.domainobject.CrowdTestProjectStatus;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 import com.mooctest.crowd.site.service.ThemeStatusService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Optional;
+
 /**
  * @program: crowd
  * @author: hanyuwei
  * @create: 2020-07-13 13:11
  **/
 @Service
+@Slf4j
 public class ThemeStatusServiceImpl implements ThemeStatusService {
 
     @Autowired
@@ -19,12 +29,16 @@ public class ThemeStatusServiceImpl implements ThemeStatusService {
 
     @Override
     public Integer updateStatus(CrowdTestProject crowdTestProject) {
+
         int status = 0;
+
         long curr = System.currentTimeMillis();
-        if (crowdTestProject.getDeadTime().getTime() < curr) {
-            status = CrowdTestProject.HAS_TIME_OUT;
+        if ((crowdTestProject.getDeadTime().before(new Timestamp(System.currentTimeMillis())))) {
+           Optional<CrowdTestProjectPO> crowdTestProjectPO =crowdTestProjectDao.findById(crowdTestProject.getId());
+           CrowdTestProjectPO crowdTestProjectPO1=crowdTestProjectPO.get();
+            crowdTestProjectPO1.setStatus(CrowdTestProjectStatus.HAS_TIME_OUT);
+            crowdTestProjectDao.save(crowdTestProjectPO1);
         }
-        crowdTestProjectDao.updateStatusById(status,crowdTestProject.getCode());
         return status;
     }
 }

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

@@ -0,0 +1,31 @@
+package com.mooctest.crowd.site.service.impl;
+
+import com.mooctest.crowd.domain.dao.CrowdTestTaskDao;
+import com.mooctest.crowd.domain.domainobject.CrowdTestProject;
+import com.mooctest.crowd.domain.domainobject.CrowdTestTask;
+import com.mooctest.crowd.site.service.ThemeStatusTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: crowd
+ * @author: hanyuwei
+ * @create: 2020-07-13 13:11
+ **/
+@Service
+public class ThemeStatusTaskServiceImpl implements ThemeStatusTaskService {
+
+    @Autowired
+    private CrowdTestTaskDao crowdTestTaskDao;
+
+    @Override
+    public Integer updateStatus(CrowdTestTask crowdTestTask) {
+        int status = 0;
+        long curr = System.currentTimeMillis();
+        if (crowdTestTask.getDeadTime().getTime() < curr) {
+            status = CrowdTestProject.HAS_TIME_OUT;
+        }
+        crowdTestTaskDao.updateStatusById(status,crowdTestTask.getCode());
+        return status;
+    }
+}

site/src/test/java/com/mooctest/crowd/site/SiteApplicationTests.java

@@ -1,16 +1,39 @@
-//package com.mooctest.crowd.site;
-//
-//import com.mooctest.crowd.site.service.AgencyService;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//@RunWith(SpringRunner.class)
-//@SpringBootTest
-//public class SiteApplicationTests {
-//    @Autowired
-//    private AgencyService agencyService;
-//
-//
-//}
+package com.mooctest.crowd.site;
+
+import com.mooctest.crowd.domain.dao.CrowdTestProjectDao;
+import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
+import com.mooctest.crowd.site.service.AgencyService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Optional;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class SiteApplicationTests {
+    @Autowired
+    private CrowdTestProjectDao  crowdTestProjectDao;
+
+    @Test
+    public  void test(){
+        Optional<CrowdTestProjectPO> crowdTestProjectPO=crowdTestProjectDao.findById(223l);
+         CrowdTestProjectPO crowdTestProjectPO1=crowdTestProjectPO.get();
+         crowdTestProjectPO1.setStatus(5);
+         crowdTestProjectDao.save(crowdTestProjectPO1);
+
+
+
+
+
+    }
+
+
+
+
+
+
+
+}