Commit ee7b2ce17bfe2bbd37ee1b333d54166976b8fd92
1 parent
17944d3c
新增集团id
Showing
2 changed files
with
7 additions
and
2 deletions
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/result/ClueChangeResult.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/ClueChangeNoticeTask.java
... | ... | @@ -10,6 +10,7 @@ import lombok.Getter; |
10 | 10 | import lombok.extern.slf4j.Slf4j; |
11 | 11 | import org.springframework.beans.factory.annotation.Autowired; |
12 | 12 | import org.springframework.beans.factory.annotation.Value; |
13 | +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; | |
13 | 14 | import org.springframework.data.redis.core.StringRedisTemplate; |
14 | 15 | import org.springframework.scheduling.annotation.Scheduled; |
15 | 16 | import org.springframework.stereotype.Component; |
... | ... | @@ -28,7 +29,7 @@ import java.util.concurrent.CompletableFuture; |
28 | 29 | */ |
29 | 30 | @Component |
30 | 31 | @Slf4j |
31 | -//@ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on") | |
32 | +@ConditionalOnProperty(prefix = "task", name = "switch", havingValue = "on") | |
32 | 33 | public class ClueChangeNoticeTask { |
33 | 34 | private final ClueChangeProducer clueChangeProducer; |
34 | 35 | private final FollowClueService followClueService; |
... | ... | @@ -55,9 +56,9 @@ public class ClueChangeNoticeTask { |
55 | 56 | CompletableFuture.runAsync(() -> { |
56 | 57 | FollowClue clue = followClueService.getById(clueId); |
57 | 58 | if (Objects.nonNull(clue)) { |
58 | - | |
59 | 59 | ClueChangeResult result = new ClueChangeResult(); |
60 | 60 | result.setFrameNo(clue.getVin()); |
61 | + result.setGroupId(clue.getGroupId()); | |
61 | 62 | result.setChangeType(ClueChangeResult.ChangeType.STOP); |
62 | 63 | if (FollowTypeEnum.RM.equals(clue.getClueType())) { |
63 | 64 | result.setClueType(CustomerFollowTypeEnum.RM.getValue()); | ... | ... |