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

 Conflicts:

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

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

@@ -105,6 +105,5 @@ public class CrowdProjectVO implements Serializable {
             this.statusVO.setText("已截止");
             this.statusVO.setStyle("warning");
         }
-
     }
 }

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

@@ -1,6 +1,8 @@
 package com.mooctest.crowd.site.data.vo;
 
+import com.mooctest.crowd.domain.domainobject.CrowdTestProjectStatus;
 import com.mooctest.crowd.domain.domainobject.Resource;
+import com.mooctest.crowd.domain.domainobject.ResourceStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -30,6 +32,7 @@ public class ResourceVO implements Serializable {
     private Timestamp startTime;
     private String personnel;
     private String remarks;
+    private StatusVO statusVO;
 
     public ResourceVO(Resource resource){
         code = resource.getCode();
@@ -47,4 +50,5 @@ public class ResourceVO implements Serializable {
         personnel=resource.getPersonnel();
         remarks=resource.getRemarks();
     }
+
 }

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

@@ -1227,6 +1227,20 @@ public class WebMediatorImpl implements ViewMediator {
             resourceVO.setStandard(resourcePO.getStandard());
             resourceVO.setUnit(resourcePO.getUnit());
             resourceVO.setState(resourcePO.getState());
+            StatusVO statusVO = new StatusVO();
+            if(resourcePO.getState()==0){
+                statusVO.setText("空闲");
+                resourceVO.setStatusVO(statusVO);
+            }else if(resourcePO.getState()==1){
+                statusVO.setText("占用");
+                resourceVO.setStatusVO(statusVO);
+            }else if(resourcePO.getState()==2){
+                statusVO.setText("可用");
+                resourceVO.setStatusVO(statusVO);
+            }else if(resourcePO.getState()==3){
+                statusVO.setText("故障");
+                resourceVO.setStatusVO(statusVO);
+            }
             resourceVO.setStartTime(resourcePO.getStartTime());
             resourceVO.setPersonnel(resourcePO.getPersonnel());
             resourceVO.setRemarks(resourcePO.getRemarks());
@@ -1251,14 +1265,20 @@ public class WebMediatorImpl implements ViewMediator {
         resourceVO.setUnitWork(resourcePO.get().getUnitWork());
         resourceVO.setStandard(resourcePO.get().getStandard());
         resourceVO.setUnit(resourcePO.get().getUnit());
-        if (resourcePO.get().getState() == 0) {
-            resourceVO.setState(ResourceStatus.R_FREE);
-        } else if (resourcePO.get().getState() == 1) {
-            resourceVO.setState(ResourceStatus.R_OCCUPY);
-        } else if (resourcePO.get().getState() == 2) {
-            resourceVO.setState(ResourceStatus.R_USABLE);
-        } else {
-            resourceVO.setState(ResourceStatus.R_FAULT);
+        resourceVO.setState(resourcePO.get().getState());
+        StatusVO statusVO = new StatusVO();
+        if(resourcePO.get().getState()==0){
+            statusVO.setText("空闲");
+            resourceVO.setStatusVO(statusVO);
+        }else if(resourcePO.get().getState()==1){
+            statusVO.setText("占用");
+            resourceVO.setStatusVO(statusVO);
+        }else if(resourcePO.get().getState()==2){
+            statusVO.setText("可用");
+            resourceVO.setStatusVO(statusVO);
+        }else if(resourcePO.get().getState()==3){
+            statusVO.setText("故障");
+            resourceVO.setStatusVO(statusVO);
         }
         resourceVO.setStartTime(resourcePO.get().getStartTime());
         resourceVO.setPersonnel(resourcePO.get().getPersonnel());

site/src/main/resources/application.yml

@@ -111,8 +111,8 @@ spring:
     database: 6
 user:
   service:
-#    baseUrl: http://127.0.0.1:8081
-    baseUrl: http://59.42.10.53:8081
+    baseUrl: http://127.0.0.1:8081
+#    baseUrl: http://59.42.10.53:8081
 
 website:
   domain: mooctest.net