From c7109b0bae9019054f02f8611b7aa138d5c0deab Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 2 Jun 2020 15:33:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=B7=BB=E5=8A=A0=E5=AD=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/tall/bean/vo/TaskVo.java | 2 ++ .../ccsens/tall/service/TaskPluginService.java | 15 +++++++++++++++ tall/src/main/resources/application-dev.yml | 1 + tall/src/main/resources/application-prod.yml | 3 ++- tall/src/main/resources/application-test.yml | 3 ++- tall/src/main/resources/application.yml | 4 ++-- .../main/resources/mapper_dao/TaskDetailDao.xml | 6 ++++++ util/src/main/java/com/ccsens/util/PropUtil.java | 5 +++++ .../main/java/com/ccsens/util/WebConstant.java | 2 +- 9 files changed, 36 insertions(+), 5 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 d6c4218d..3067aa47 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 @@ -116,6 +116,8 @@ public class TaskVo { private int process; @ApiModelProperty("子项目id") private Long subProjectId; + @ApiModelProperty("子项目名字") + private String subProjectName; @ApiModelProperty("服务器时间") private Long serverTime; @ApiModelProperty("任务类型 0普通任务 1虚拟任务") diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java index ccb202c9..6be15c0a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java @@ -3,12 +3,14 @@ package com.ccsens.tall.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.ccsens.tall.bean.dto.PluginDto; import com.ccsens.tall.bean.po.*; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.*; import com.ccsens.util.CodeEnum; +import com.ccsens.util.PropUtil; import com.ccsens.util.WebConstant; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; @@ -157,9 +159,22 @@ public class TaskPluginService implements ITaskPluginService{ return commentInfo; } + /** + * 查找评论 + * @param currentUserId + * @param taskId + * @return + */ @Override public List getComment(Long currentUserId, Long taskId) { List commentInfoList = proTaskCommentDao.getCommentByTaskId(currentUserId,taskId); + if(CollectionUtil.isNotEmpty(commentInfoList)){ + commentInfoList.forEach(commentInfo -> { + if(StrUtil.isEmpty(commentInfo.getAvatarUrl())){ + commentInfo.setAvatarUrl(PropUtil.notGatewayUrl + "staticrec/logo.png"); + } + }); + } return commentInfoList; } diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index 97cb23b2..44f2e5ce 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -29,4 +29,5 @@ spring: timeout: 1000ms swagger: enable: true +notGatewayUrl: /home/staticrec/logo.png diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml index 602cd0ca..64ac9c68 100644 --- a/tall/src/main/resources/application-prod.yml +++ b/tall/src/main/resources/application-prod.yml @@ -35,4 +35,5 @@ eureka: # ip-address: 140.143.228.3 ip-address: 192.144.182.42 -gatewayUrl: https://www.tall.wiki/gateway/ \ No newline at end of file +gatewayUrl: https://www.tall.wiki/gateway/ +notGatewayUrl: https://www.tall.wiki/ \ No newline at end of file diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml index 62fa2570..1c2a13f0 100644 --- a/tall/src/main/resources/application-test.yml +++ b/tall/src/main/resources/application-test.yml @@ -32,4 +32,5 @@ swagger: eureka: instance: ip-address: 192.168.0.99 -gatewayUrl: http://192.168.0.99/gateway/ \ No newline at end of file +gatewayUrl: http://192.168.0.99/gateway/ +notGatewayUrl: http://192.168.0.99/ \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b2acd365..c88e995d 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml index 5694701f..f4f239d7 100644 --- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml @@ -28,6 +28,7 @@ + @@ -76,6 +77,7 @@ s.real_end_time as tRealEndTime, s.complated_status as tProcess, d.sub_project_id as tSubProjectId, + d.sub_project as tSubProjectName, d.money as tMoney, d.virtual as tVirtual, d.delay as tDelay, @@ -152,6 +154,7 @@ s.real_end_time as tRealEndTime, s.complated_status as tProcess, d.sub_project_id as tSubProjectId, + d.sub_project as tSubProjectName, d.money as tMoney, d.virtual as tVirtual, d.delay as tDelay, @@ -225,6 +228,7 @@ s.real_end_time as tRealEndTime, s.complated_status as tProcess, d.sub_project_id as tSubProjectId, + d.sub_project as tSubProjectName, d.money as tMoney, d.virtual as tVirtual, d.delay as tDelay, @@ -279,6 +283,7 @@ s.real_end_time as tRealEndTime, s.complated_status as tProcess, d.sub_project_id as tSubProjectId, + d.sub_project as tSubProjectName, d.money as tMoney, d.virtual as tVirtual, d.delay as tDelay, @@ -360,6 +365,7 @@ s.real_end_time as tRealEndTime, s.complated_status as tProcess, d.sub_project_id as tSubProjectId, + d.sub_project as tSubProjectName, d.money as tMoney, d.virtual as tVirtual, d.delay as tDelay, diff --git a/util/src/main/java/com/ccsens/util/PropUtil.java b/util/src/main/java/com/ccsens/util/PropUtil.java index eaa353e5..b2ead448 100644 --- a/util/src/main/java/com/ccsens/util/PropUtil.java +++ b/util/src/main/java/com/ccsens/util/PropUtil.java @@ -17,12 +17,17 @@ public class PropUtil { public static String projectName; public static String contextPath; public static String gatewayUrl; + public static String notGatewayUrl; public static String qrCode; @Value("${gatewayUrl:}") public void setGatewayUrl(String gatewayUrl) { PropUtil.gatewayUrl = gatewayUrl; } + @Value("${notGatewayUrl:}") + public void setNotGatewayUrl(String notGatewayUrl) { + PropUtil.notGatewayUrl = notGatewayUrl; + } @Value("${file.path:}") public void setPath(String path) { PropUtil.path = path; diff --git a/util/src/main/java/com/ccsens/util/WebConstant.java b/util/src/main/java/com/ccsens/util/WebConstant.java index 8fe76f0e..3cb0b396 100644 --- a/util/src/main/java/com/ccsens/util/WebConstant.java +++ b/util/src/main/java/com/ccsens/util/WebConstant.java @@ -64,7 +64,7 @@ public class WebConstant { public static final String DEFAULT_NICKNAME = "普通用户"; public static final String DEFAULT_DESCRIPTION = "这个人很懒，什么都没有留下"; public static final String DEFAULT_AVATAR = ""; - public static final String DEFAULT_AVATAR_LOGO = ""; + public static final String DEFAULT_AVATAR_LOGO = "/home/cloud/tall/uploads"; public static final String KEY_WEBSOCKET_GROUPID = "WebScoket_groupId"; public static final String PREFIX_WEBSOCKET_GROUPID = "groupId=";