From 573fc2c2a6009cca2c852ff021d144d8da655265 Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Fri, 6 Dec 2019 15:44:48 +0800
Subject: [PATCH] v1.1

---
 .../java/com/ccsens/tall/bean/vo/TaskVo.java    |  6 ++----
 .../ccsens/tall/service/IProShowService.java    |  2 ++
 .../com/ccsens/tall/service/ProShowService.java | 17 +++++++++++++++++
 .../tall/service/ProTaskDetailService.java      |  6 ++++++
 .../com/ccsens/tall/web/DebugController.java    |  2 --
 .../com/ccsens/tall/web/DomainController.java   |  2 +-
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
index e70b40a8..73c9ccf5 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
@@ -89,10 +89,8 @@ public class TaskVo {
         private Long endTime;
         @ApiModelProperty("时长")
         private Long duration;
-        @ApiModelProperty("显示的开始时间")
-        private String showBeginTime;
-        @ApiModelProperty("显示的结束时间")
-        private String showEndTime;
+        @ApiModelProperty("显示的日期格式")
+        private String showTimeFormat;
         @ApiModelProperty("循环周期")
         private String cycle;
         @ApiModelProperty("跳转模式 -1手动，0自动，1延迟")
diff --git a/tall/src/main/java/com/ccsens/tall/service/IProShowService.java b/tall/src/main/java/com/ccsens/tall/service/IProShowService.java
index bf05270e..9b1ccd6c 100644
--- a/tall/src/main/java/com/ccsens/tall/service/IProShowService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/IProShowService.java
@@ -4,4 +4,6 @@ import com.ccsens.tall.bean.po.ProShow;
 
 public interface IProShowService{
     void saveProShow(ProShow proShow);
+
+    ProShow selectByProjectId(Long projectId)throws Exception;
 }
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProShowService.java b/tall/src/main/java/com/ccsens/tall/service/ProShowService.java
index d280139a..f1ede99d 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProShowService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProShowService.java
@@ -1,10 +1,14 @@
 package com.ccsens.tall.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.ccsens.tall.bean.po.ProShow;
+import com.ccsens.tall.bean.po.ProShowExample;
 import com.ccsens.tall.persist.dao.ProShowDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ProShowService implements IProShowService{
     @Autowired
@@ -14,4 +18,17 @@ public class ProShowService implements IProShowService{
     public void saveProShow(ProShow proShow) {
         proShowDao.insertSelective(proShow);
     }
+
+    @Override
+    public ProShow selectByProjectId(Long projectId) throws Exception {
+        ProShow proShow = null;
+
+        ProShowExample proShowExample = new ProShowExample();
+        proShowExample.createCriteria().andProjectIdEqualTo(projectId);
+        List<ProShow> proShowList = proShowDao.selectByExample(proShowExample);
+        if(CollectionUtil.isNotEmpty(proShowList)){
+            proShow = proShowList.get(0);
+        }
+        return proShow;
+    }
 }
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
index 9a53b29d..4578caee 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
@@ -176,6 +176,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
                     normalTask.setProcess(subTimeMember.getComplatedStatus());
                     normalTask.setRealEndTime(subTimeMember.getRealFinishTime());
                 }
+
             }
             TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process);
             if (CollectionUtil.isNotEmpty(task.getGlobalTask())) {
@@ -461,6 +462,11 @@ public class ProTaskDetailService implements IProTaskDetailService {
         return name;
     }
 
+    /**
+     *
+     */
+
+
     /**
      * 任务清单
      */
diff --git a/tall/src/main/java/com/ccsens/tall/web/DebugController.java b/tall/src/main/java/com/ccsens/tall/web/DebugController.java
index 408e78c6..5c5bca03 100644
--- a/tall/src/main/java/com/ccsens/tall/web/DebugController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/DebugController.java
@@ -1,6 +1,5 @@
 package com.ccsens.tall.web;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.ccsens.util.JsonResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParams;
@@ -10,7 +9,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
 
 @Api(tags = "DEBUG" , description = "DebugController | ")
 @RestController
diff --git a/tall/src/main/java/com/ccsens/tall/web/DomainController.java b/tall/src/main/java/com/ccsens/tall/web/DomainController.java
index f2950665..dc8d305d 100644
--- a/tall/src/main/java/com/ccsens/tall/web/DomainController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/DomainController.java
@@ -31,6 +31,6 @@ public class DomainController {
     public JsonResponse<DomainVo.DomainInfo> getDomainByName(HttpServletRequest request,
                                                                           @RequestParam(required = true) String domainName) throws Exception {
         DomainVo.DomainInfo domainInfo = domainService.getDomainByName(domainName);
-        return JsonResponse.newInstance().ok();
+        return JsonResponse.newInstance().ok(domainInfo);
     }
 }