|
|
@@ -55,6 +55,14 @@ public class DietRecommendationService {
|
|
|
private static final List<String> TODAY_STATUS_WHITELIST =
|
|
|
Collections.unmodifiableList(Arrays.asList("pending", "accepted", "completed"));
|
|
|
|
|
|
+ /**
|
|
|
+ * SC-C-12 分餐次记录餐型口径(child.diet.viewMenu / S-cfc-332):
|
|
|
+ * 当日三餐的规范展示顺序,也是「分餐次记录走契约视图」的判定集合。
|
|
|
+ * 遗留单餐次记录(mealType=all 或 null)不在此列,保持原透传行为(老客户端 / 存量数据兼容)。
|
|
|
+ */
|
|
|
+ private static final List<String> MEAL_TYPE_ORDER =
|
|
|
+ Collections.unmodifiableList(Arrays.asList("breakfast", "lunch", "dinner"));
|
|
|
+
|
|
|
/**
|
|
|
* 营养目标上限(teacher.nutrition.plan / SC-T-26 精准营养方案制定)。
|
|
|
* 日口径:热量 kcal、宏量营养素 g;任一字段超出视为非法目标(超上限拦截)。
|
|
|
@@ -116,26 +124,154 @@ public class DietRecommendationService {
|
|
|
|
|
|
List<DietRecommendation> records = dietRecommendationMapper.selectList(wrapper);
|
|
|
|
|
|
+ if (records.isEmpty()) {
|
|
|
+ return emptyTodayView(dateStr);
|
|
|
+ }
|
|
|
+
|
|
|
+ // SC-C-12 分餐次记录(breakfast/lunch/dinner,child.diet.viewMenu / S-cfc-332)走契约视图:
|
|
|
+ // 当日三餐聚合(非只取首条)/ 每餐次取最新版本(regenerate 后不回退旧菜单)/ 空壳 menuJson 回落空态。
|
|
|
+ // 遗留单餐次记录(mealType=all 或 null)保持原透传行为,兼容老客户端与存量数据(既有 /today 契约)。
|
|
|
+ if (hasPerMealRecord(records)) {
|
|
|
+ return buildMealTypeView(dateStr, records);
|
|
|
+ }
|
|
|
+
|
|
|
+ DietRecommendation record = records.get(0);
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
- if (!records.isEmpty()) {
|
|
|
- DietRecommendation record = records.get(0);
|
|
|
- result.put("id", record.getId());
|
|
|
- result.put("date", dateStr);
|
|
|
- result.put("mealType", record.getMealType());
|
|
|
- result.put("menu", record.getMenuJson());
|
|
|
- result.put("nutritionSummary", record.getNutritionSummary());
|
|
|
- result.put("status", record.getStatus());
|
|
|
- result.put("version", record.getVersion());
|
|
|
- result.put("participantMemberIds", record.getParticipantMemberIds());
|
|
|
- result.put("viewKey", record.getViewKey());
|
|
|
- } else {
|
|
|
- result.put("id", null);
|
|
|
- result.put("date", dateStr);
|
|
|
- result.put("message", "暂无推荐,请生成");
|
|
|
+ result.put("id", record.getId());
|
|
|
+ result.put("date", dateStr);
|
|
|
+ result.put("mealType", record.getMealType());
|
|
|
+ result.put("menu", record.getMenuJson());
|
|
|
+ result.put("nutritionSummary", record.getNutritionSummary());
|
|
|
+ result.put("status", record.getStatus());
|
|
|
+ result.put("version", record.getVersion());
|
|
|
+ result.put("participantMemberIds", record.getParticipantMemberIds());
|
|
|
+ result.put("viewKey", record.getViewKey());
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 是否存在 SC-C-12 分餐次记录(决定走契约视图还是遗留透传)。 */
|
|
|
+ private boolean hasPerMealRecord(List<DietRecommendation> records) {
|
|
|
+ for (DietRecommendation r : records) {
|
|
|
+ if (MEAL_TYPE_ORDER.contains(r.getMealType())) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * SC-C-12 当日三餐契约视图(child.diet.viewMenu / S-cfc-332):
|
|
|
+ * <ol>
|
|
|
+ * <li>过滤:仅分餐次记录且 menuJson 非空壳(null / "" / "{}" / 无 meals 数组 / meals 为空 → 空壳,回落空态);</li>
|
|
|
+ * <li>每餐次取最新版本记录(version 高者优先,平局取 id 大者——DB 不保证顺序时选择确定);</li>
|
|
|
+ * <li>按早餐→午餐→晚餐规范顺序合并三餐 meals,产出单份今日菜单;</li>
|
|
|
+ * <li>主记录为最新版本记录,透传 id/mealType/nutritionSummary/status/version/participantMemberIds/viewKey,
|
|
|
+ * 前端据此 id 渲染 / 后续 regenerate 与删除命中主记录。</li>
|
|
|
+ * </ol>
|
|
|
+ */
|
|
|
+ private Map<String, Object> buildMealTypeView(String dateStr, List<DietRecommendation> records) {
|
|
|
+ Map<String, DietRecommendation> latestByMealType = new LinkedHashMap<>();
|
|
|
+ for (DietRecommendation r : records) {
|
|
|
+ if (!MEAL_TYPE_ORDER.contains(r.getMealType())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (!hasUsableMealMenu(r.getMenuJson())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ DietRecommendation cur = latestByMealType.get(r.getMealType());
|
|
|
+ if (cur == null || isNewer(r, cur)) {
|
|
|
+ latestByMealType.put(r.getMealType(), r);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (latestByMealType.isEmpty()) {
|
|
|
+ return emptyTodayView(dateStr);
|
|
|
+ }
|
|
|
+
|
|
|
+ List<Object> mergedMeals = new ArrayList<>();
|
|
|
+ DietRecommendation master = null;
|
|
|
+ for (String mealType : MEAL_TYPE_ORDER) {
|
|
|
+ DietRecommendation r = latestByMealType.get(mealType);
|
|
|
+ if (r == null) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ mergeMeals(mergedMeals, r.getMenuJson());
|
|
|
+ if (master == null || isNewer(r, master)) {
|
|
|
+ master = r;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+ Map<String, Object> menu = new LinkedHashMap<>();
|
|
|
+ menu.put("meals", mergedMeals);
|
|
|
+
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
+ result.put("id", master.getId());
|
|
|
+ result.put("date", dateStr);
|
|
|
+ result.put("mealType", master.getMealType());
|
|
|
+ result.put("menu", safeWrite(menu));
|
|
|
+ result.put("nutritionSummary", master.getNutritionSummary());
|
|
|
+ result.put("status", master.getStatus());
|
|
|
+ result.put("version", master.getVersion());
|
|
|
+ result.put("participantMemberIds", master.getParticipantMemberIds());
|
|
|
+ result.put("viewKey", master.getViewKey());
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 空态视图(SC-C-12 无食谱空态:前端以 data.id=null 判定空态卡,展示「暂无推荐,请生成」)。 */
|
|
|
+ private Map<String, Object> emptyTodayView(String dateStr) {
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
+ result.put("id", null);
|
|
|
+ result.put("date", dateStr);
|
|
|
+ result.put("message", "暂无推荐,请生成");
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ /** 空壳菜单判定:无文本 / "{}" / 非法 JSON / 无 meals 数组 / meals 数组为空 → 不可渲染(回落空态)。 */
|
|
|
+ private static boolean hasUsableMealMenu(String menuJson) {
|
|
|
+ if (!hasText(menuJson) || "{}".equals(menuJson.trim())) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ try {
|
|
|
+ JsonNode root = OBJECT_MAPPER.readTree(menuJson);
|
|
|
+ JsonNode meals = root == null ? null : root.get("meals");
|
|
|
+ return meals != null && meals.isArray() && meals.size() > 0;
|
|
|
+ } catch (Exception e) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 比较两条分餐次记录的「新旧」:version 高者新;version 相同取 id 大者。 */
|
|
|
+ private static boolean isNewer(DietRecommendation a, DietRecommendation b) {
|
|
|
+ long va = a.getVersion() == null ? 1L : a.getVersion();
|
|
|
+ long vb = b.getVersion() == null ? 1L : b.getVersion();
|
|
|
+ if (va != vb) {
|
|
|
+ return va > vb;
|
|
|
+ }
|
|
|
+ long ia = a.getId() == null ? 0L : a.getId();
|
|
|
+ long ib = b.getId() == null ? 0L : b.getId();
|
|
|
+ return ia > ib;
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 抽取单条 menuJson 的 meals 数组并入聚合列表(原始 JSON 串在结构上保持逐字透传)。 */
|
|
|
+ private static void mergeMeals(List<Object> mergedMeals, String menuJson) {
|
|
|
+ if (menuJson == null || menuJson.trim().isEmpty()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ try {
|
|
|
+ JsonNode root = OBJECT_MAPPER.readTree(menuJson);
|
|
|
+ JsonNode mealsNode = root == null ? null : root.get("meals");
|
|
|
+ if (mealsNode != null && mealsNode.isArray()) {
|
|
|
+ for (JsonNode meal : mealsNode) {
|
|
|
+ Object mealObj = OBJECT_MAPPER.convertValue(meal, Object.class);
|
|
|
+ if (mealObj != null) {
|
|
|
+ mergedMeals.add(mealObj);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("聚合当日三餐菜单失败(跳过该餐次): {}", e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 生成 / 重新生成食谱(AI 正常 → AI 失败降级 → 菜数归一化,三条路径统一收口于此)。
|
|
|
*
|