Browse Source

众测广场项目只显示项目状态为1的。项目截止时间小于当前时间的 将状态设置成已截止。

xuxuan 5 years ago
parent
commit
04123d4ad1

+ 3 - 2
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1075,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;

+ 7 - 8
site/src/main/java/com/mooctest/crowd/site/service/impl/ThemeStatusServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * @program: crowd
@@ -29,16 +30,14 @@ public class ThemeStatusServiceImpl implements ThemeStatusService {
     @Override
     public Integer updateStatus(CrowdTestProject crowdTestProject) {
 
-        int  status=0;
+        int status = 0;
 
         long curr = System.currentTimeMillis();
-        if ((crowdTestProject.getDeadTime().before(new Timestamp(System.currentTimeMillis())))){
-            CrowdTestProjectPO crowdTestProjectPO = crowdTestProjectDao.findById(crowdTestProject.getId()).get();
-            System.out.println(crowdTestProjectPO+"weihanyushishabi ");
-            BeanUtils.copyProperties(crowdTestProject, crowdTestProjectPO);
-            crowdTestProjectPO.setStatus(CrowdTestProjectStatus.HAS_TIME_OUT);
-
-            crowdTestProjectDao.save(crowdTestProjectPO);
+        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);
         }
         return status;
     }

+ 39 - 16
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);
+
+
+
+
+
+    }
+
+
+
+
+
+
+
+}