From 0389be6d20ee61e8dfbed0e35c3ba11619b2c3fb Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 9 Apr 2021 10:57:51 +0800
Subject: [PATCH] =?UTF-8?q?2021049=E4=B8=8A=E4=BC=A0=E4=BA=A4=E4=BB=98?=
 =?UTF-8?q?=E7=89=A9=E5=8E=BB=E6=8E=89=E6=96=87=E4=BB=B6=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tall/service/TaskDeliverService.java      | 27 ++++++++++---------
 tall/src/main/resources/application.yml       |  4 +--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
index 6fe29624..ccac3969 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
@@ -217,15 +217,15 @@ public class TaskDeliverService implements ITaskDeliverService {
         //将文件信息与交付物绑定，添加记录deliverPostLog
         if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo())) {
             for (DeliverDto.FileInfo fileInfo : uploadDeliver.getFileInfo()) {
-                SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId());
-                if(ObjectUtil.isNull(file)){
-                    throw new BaseException(CodeEnum.NOT_DELIVER_FILE);
-                }
+//                SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId());
+//                if(ObjectUtil.isNull(file)){
+//                    throw new BaseException(CodeEnum.NOT_DELIVER_FILE);
+//                }
                 ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog();
                 deliverPostLog.setId(snowflake.nextId());
                 deliverPostLog.setDeliverId(uploadDeliver.getDeliverId());
                 deliverPostLog.setTaskSubTimeId(subTimeId);
-                deliverPostLog.setFileId(file.getId());
+                deliverPostLog.setFileId(fileInfo.getId());
                 deliverPostLog.setUserId(currentUserId);
                 deliverPostLog.setDescription(uploadDeliver.getDescription());
                 deliverPostLog.setTime(now);
@@ -302,9 +302,9 @@ public class TaskDeliverService implements ITaskDeliverService {
         inMessage.setData(JacksonUtil.beanToJson(uploadMessage));
         rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME,
                 JacksonUtil.beanToJson(inMessage) );
-//        //用智能助手发送消息
-//        SysProject project = sysProjectDao.selectByPrimaryKey(taskDetail.getProjectId());
-//        robotService.addDeliverRobotSend(currentUserId,taskDeliver.getName(),subTimeId, project);
+        //用智能助手发送消息
+        SysProject project = sysProjectDao.selectByPrimaryKey(taskDetail.getProjectId());
+        robotService.addDeliverRobotSend(currentUserId,taskDeliver.getName(),subTimeId, project);
 
         //返回
         List<ProjectVo.DeliverInfo> deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId());
@@ -469,11 +469,14 @@ public class TaskDeliverService implements ITaskDeliverService {
                     filePath.setDeleteTime(filePath.getUpdateTime().getTime());
                 }
                 // TODO 修改文件路径为可下载路径
+                List<String> a = new ArrayList<>();
+                a.add(filePath.getFileId().toString());
 
-                if(StrUtil.isNotEmpty(filePath.getUrl())) {
-//                    filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl());
-                    filePath.setUrl(PropUtil.imgDomain + "/" + filePath.getUrl());
-                }
+
+//                if(StrUtil.isNotEmpty(filePath.getUrl())) {
+////                    filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl());
+//                    filePath.setUrl(PropUtil.imgDomain + "/" + filePath.getUrl());
+//                }
                 if (ObjectUtil.isNotNull(filePath.getUploaderId())) {
                     //添加上传人的姓名信息
                     ProMember member = proMemberService.selectByUserId(filePath.getUploaderId(), task.getProjectId());
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b5408a3a..ebc544af 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common