From cf4609ce587f860022b5e04fab724d6af557df91 Mon Sep 17 00:00:00 2001 From: Kurisu Date: Mon, 1 Feb 2021 15:31:21 +0800 Subject: [PATCH] :fire: 调整定时任务频率、跟进历史记录bug修复 --- fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java | 2 +- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java | 2 ++ fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java index a413aa1..df53e48 100644 --- a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java +++ b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java @@ -102,7 +102,7 @@ public class FollowRecordTask { * 事故车待办随时推送 * 推送到待办系统 */ - @Scheduled(initialDelay = 1500, fixedRate = 1000) + @Scheduled(initialDelay = 1500, fixedRate = 1000 * 3) @Transactional(rollbackFor = Exception.class) public void push2AccTodo() { List list = followRecordService.list(Wrappers.lambdaQuery() diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java index a2975b6..5404a96 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java @@ -151,7 +151,9 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { vo.setAttachments(attachment.getAttachments()); vo.setId(attachment.getId()); vo.setRecordId(attachment.getRecordId()); + vo.setTaskId(taskId); vo.setAttType(attachment.getAttType()); + vo.setFeedbackType(attachment.getFeedbackType()); vo.setFollowType(followRecordList.get(0).getType()); vo.setUploadTime(attachment.getUploadTime()); vo.setDescribes(attachment.getDescribes()); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java index a531828..c975146 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java @@ -81,6 +81,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy { int count = followRecordLogService.count(Wrappers.lambdaQuery() .eq(FollowRecordLog::getRecordId, followRecord.getId()) .eq(FollowRecordLog::getAttType, AttTypeEnum.SMART_PHONE) + .isNotNull(FollowRecordLog::getFeedbackType) ); vo.setHadCall(count > 0); return vo; -- libgit2 0.22.2