|
|
@@ -54,6 +54,9 @@ public class FamilyContextService {
|
|
|
@Resource
|
|
|
private GrowthTaskMapper growthTaskMapper;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private TaskMapper taskMapper;
|
|
|
+
|
|
|
@Resource
|
|
|
private PiisService piisService;
|
|
|
|
|
|
@@ -122,22 +125,22 @@ public class FamilyContextService {
|
|
|
c.put("healthReport", reportInfo);
|
|
|
}
|
|
|
|
|
|
- List<GrowthTask> aiTasks = growthTaskMapper.selectList(
|
|
|
- new LambdaQueryWrapper<GrowthTask>()
|
|
|
- .eq(GrowthTask::getType, "AI_GENERATED")
|
|
|
- .eq(GrowthTask::getEnabled, 1)
|
|
|
- .orderByDesc(GrowthTask::getCreatedAt)
|
|
|
+ // 统一任务系统:AI 任务已迁入 tasks 表(source_type=ai)
|
|
|
+ List<Task> aiTasks = taskMapper.selectList(
|
|
|
+ new LambdaQueryWrapper<Task>()
|
|
|
+ .eq(Task::getSourceType, "ai")
|
|
|
+ .orderByDesc(Task::getCreatedAt)
|
|
|
.last("LIMIT 10"));
|
|
|
if (aiTasks != null && !aiTasks.isEmpty()) {
|
|
|
List<Map<String, Object>> taskList = new ArrayList<>();
|
|
|
- for (GrowthTask gt : aiTasks) {
|
|
|
+ for (Task gt : aiTasks) {
|
|
|
Map<String, Object> t = new LinkedHashMap<>();
|
|
|
t.put("id", gt.getId());
|
|
|
t.put("title", gt.getTitle());
|
|
|
t.put("description", gt.getDescription());
|
|
|
- t.put("dimension", gt.getDimension());
|
|
|
- t.put("rewardPoints", gt.getRewardPoints());
|
|
|
- t.put("sourceConversationId", gt.getSourceConversationId());
|
|
|
+ t.put("dimension", gt.getDimensionCode());
|
|
|
+ t.put("rewardPoints", gt.getPoints());
|
|
|
+ t.put("sourceConversationId", gt.getSourceId());
|
|
|
taskList.add(t);
|
|
|
}
|
|
|
c.put("aiGeneratedTasks", taskList);
|