Commit cf4609ce587f860022b5e04fab724d6af557df91

Authored by 张志伟
1 parent 2ae387c9

:fire: 调整定时任务频率、跟进历史记录bug修复

fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java
@@ -102,7 +102,7 @@ public class FollowRecordTask { @@ -102,7 +102,7 @@ public class FollowRecordTask {
102 * 事故车待办随时推送 102 * 事故车待办随时推送
103 * 推送到待办系统 103 * 推送到待办系统
104 */ 104 */
105 - @Scheduled(initialDelay = 1500, fixedRate = 1000) 105 + @Scheduled(initialDelay = 1500, fixedRate = 1000 * 3)
106 @Transactional(rollbackFor = Exception.class) 106 @Transactional(rollbackFor = Exception.class)
107 public void push2AccTodo() { 107 public void push2AccTodo() {
108 List<FollowRecord> list = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery() 108 List<FollowRecord> list = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
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 { @@ -151,7 +151,9 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
151 vo.setAttachments(attachment.getAttachments()); 151 vo.setAttachments(attachment.getAttachments());
152 vo.setId(attachment.getId()); 152 vo.setId(attachment.getId());
153 vo.setRecordId(attachment.getRecordId()); 153 vo.setRecordId(attachment.getRecordId());
  154 + vo.setTaskId(taskId);
154 vo.setAttType(attachment.getAttType()); 155 vo.setAttType(attachment.getAttType());
  156 + vo.setFeedbackType(attachment.getFeedbackType());
155 vo.setFollowType(followRecordList.get(0).getType()); 157 vo.setFollowType(followRecordList.get(0).getType());
156 vo.setUploadTime(attachment.getUploadTime()); 158 vo.setUploadTime(attachment.getUploadTime());
157 vo.setDescribes(attachment.getDescribes()); 159 vo.setDescribes(attachment.getDescribes());
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 { @@ -81,6 +81,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy {
81 int count = followRecordLogService.count(Wrappers.<FollowRecordLog>lambdaQuery() 81 int count = followRecordLogService.count(Wrappers.<FollowRecordLog>lambdaQuery()
82 .eq(FollowRecordLog::getRecordId, followRecord.getId()) 82 .eq(FollowRecordLog::getRecordId, followRecord.getId())
83 .eq(FollowRecordLog::getAttType, AttTypeEnum.SMART_PHONE) 83 .eq(FollowRecordLog::getAttType, AttTypeEnum.SMART_PHONE)
  84 + .isNotNull(FollowRecordLog::getFeedbackType)
84 ); 85 );
85 vo.setHadCall(count > 0); 86 vo.setHadCall(count > 0);
86 return vo; 87 return vo;