formate_xy.py 30 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727
  1. import requests
  2. import json
  3. import copy
  4. import hashlib
  5. from enum import Enum
  6. from time import perf_counter
  7. from fastapi import APIRouter, Depends, HTTPException, Query, Body
  8. from fastapi.concurrency import run_in_threadpool
  9. from mysql.connector.pooling import PooledMySQLConnection
  10. from app.core.config import settings
  11. from app.core.logger import get_logger
  12. from app.core.database_loader import get_db_connection
  13. from app.api.users import check_card_permission, get_current_user
  14. from app.utils.scheme import (
  15. CardDetailResponse, IMAGE_TYPE_TO_SCORE_TYPE, ImageType
  16. )
  17. from app.crud import crud_card
  18. from app.utils.xy_process import convert_internal_to_xy_format, convert_xy_to_internal_format
  19. from app.core.minio_client import minio_client
  20. from app.utils.rating_report_utils import crop_defect_image
  21. logger = get_logger(__name__)
  22. router = APIRouter()
  23. db_dependency = Depends(get_db_connection)
  24. class QueryMode(str, Enum):
  25. current = "current"
  26. next = "next"
  27. prev = "prev"
  28. def _is_center_box_shapes_empty(center_result: dict) -> bool:
  29. """
  30. 判断 center_result 中 inner/outer box 的 shapes 是否都为空。
  31. 前端某些场景会传空 shapes,直接下发给算分服务可能触发其内部越界。
  32. """
  33. if not isinstance(center_result, dict):
  34. return True
  35. box_result = center_result.get("box_result", {})
  36. if not isinstance(box_result, dict):
  37. return True
  38. inner_shapes = box_result.get("inner_box", {}).get("shapes", [])
  39. outer_shapes = box_result.get("outer_box", {}).get("shapes", [])
  40. return not inner_shapes and not outer_shapes
  41. def _normalize_center_result(center_result: dict) -> dict:
  42. """
  43. 兜底补齐算分服务依赖的 center_result 结构,避免 KeyError: 'box_result'。
  44. """
  45. normalized = center_result if isinstance(center_result, dict) else {}
  46. box_result = normalized.get("box_result")
  47. if not isinstance(box_result, dict):
  48. box_result = {}
  49. normalized["box_result"] = box_result
  50. inner_box = box_result.get("inner_box")
  51. if not isinstance(inner_box, dict):
  52. inner_box = {}
  53. box_result["inner_box"] = inner_box
  54. if not isinstance(inner_box.get("shapes"), list):
  55. inner_box["shapes"] = []
  56. outer_box = box_result.get("outer_box")
  57. if not isinstance(outer_box, dict):
  58. outer_box = {}
  59. box_result["outer_box"] = outer_box
  60. if not isinstance(outer_box.get("shapes"), list):
  61. outer_box["shapes"] = []
  62. return normalized
  63. def _prepare_recalculate_payload(edited_json: dict, source_json: dict) -> dict:
  64. """
  65. 以数据库里的原始 JSON 为底稿,合并前端编辑结果,得到更稳定的重算入参。
  66. 当前仅明确覆盖 defects;center_result 只有在前端传了非空 shapes 时才覆盖。
  67. 对前端标记为删除(edit_type=del)的缺陷,在这里直接过滤,避免重算后再次写回 modified_json。
  68. """
  69. base = copy.deepcopy(source_json) if isinstance(source_json, dict) else {}
  70. incoming = edited_json if isinstance(edited_json, dict) else {}
  71. if "id" in incoming:
  72. base["id"] = incoming["id"]
  73. if "imageWidth" in incoming:
  74. base["imageWidth"] = incoming["imageWidth"]
  75. if "imageHeight" in incoming:
  76. base["imageHeight"] = incoming["imageHeight"]
  77. base.setdefault("result", {})
  78. incoming_result = incoming.get("result", {})
  79. if not isinstance(incoming_result, dict):
  80. incoming_result = {}
  81. # defects 使用前端编辑结果覆盖;前端标记删除的项不参与重算,也不写回 modified_json
  82. incoming_defects = (
  83. incoming_result.get("defect_result", {}).get("defects", [])
  84. if isinstance(incoming_result.get("defect_result", {}), dict)
  85. else []
  86. )
  87. base["result"].setdefault("defect_result", {})
  88. filtered_defects = []
  89. if isinstance(incoming_defects, list):
  90. filtered_defects = [
  91. defect for defect in incoming_defects
  92. if not (isinstance(defect, dict) and defect.get("edit_type") == "del")
  93. ]
  94. base["result"]["defect_result"]["defects"] = filtered_defects
  95. # center_result 仅在前端有有效 shapes 时覆盖;否则沿用底稿
  96. incoming_center = incoming_result.get("center_result")
  97. if isinstance(incoming_center, dict) and not _is_center_box_shapes_empty(incoming_center):
  98. base["result"]["center_result"] = incoming_center
  99. elif "center_result" not in base["result"]:
  100. base["result"]["center_result"] = incoming_center if isinstance(incoming_center, dict) else {}
  101. base["result"]["center_result"] = _normalize_center_result(base["result"].get("center_result"))
  102. return base
  103. def _sanitize_defects_for_recalculate(defects: list):
  104. """
  105. 清理前端展示/编辑辅助字段,减少算分服务解析失败概率。
  106. """
  107. if not isinstance(defects, list):
  108. return
  109. for d in defects:
  110. if not isinstance(d, dict):
  111. continue
  112. if d.get("label") == "slight_scratch":
  113. d["label"] = "scratch"
  114. d.pop("defectImgUrl", None)
  115. d.pop("defectImgUrls", None)
  116. d.pop("gray_id", None)
  117. d.pop("fusion_id", None)
  118. d.pop("edit_type", None)
  119. d.pop("severity_level", None)
  120. d.pop("new_score", None)
  121. def _process_defects_for_json(
  122. card_id: int,
  123. img_id: int,
  124. img_path: str,
  125. json_data: dict,
  126. side: str,
  127. all_images: list = None,
  128. generate_related_images: bool = True
  129. ):
  130. """
  131. 为每条缺陷生成同面其他类型图的位置截图列表 defectImgUrls。
  132. 不再生成主缺陷截图 defectImgUrl,也不再聚合 defectDetailList。
  133. """
  134. start_time = perf_counter()
  135. if not json_data or "result" not in json_data:
  136. logger.info(
  137. "耗时埋点 _process_defects_for_json: card_id=%s image_id=%s side=%s defects=0 elapsed_ms=%.2f",
  138. card_id, img_id, side, (perf_counter() - start_time) * 1000
  139. )
  140. return
  141. defect_result = json_data["result"].get("defect_result", {})
  142. defects = defect_result.get("defects", [])
  143. side_prefix = "front_" if side.startswith("front_") else "back_"
  144. for idx, defect in enumerate(defects, start=1):
  145. min_rect = defect.get("min_rect")
  146. defect_img_url_list = []
  147. if min_rect and len(min_rect) == 3 and generate_related_images and all_images:
  148. rect_str = str(min_rect)
  149. rect_hash = hashlib.md5(rect_str.encode('utf-8')).hexdigest()[:8]
  150. same_side_images = [
  151. img for img in all_images
  152. if getattr(img, 'image_type', '').startswith(side_prefix) and getattr(img, 'id', None) != img_id
  153. ]
  154. for s_img in same_side_images:
  155. s_img_type = getattr(s_img, 'image_type', '')
  156. s_img_path = getattr(s_img, 'image_path', '')
  157. s_img_id = getattr(s_img, 'id', 0)
  158. s_filename = f"xy_{card_id}_{s_img_id}_{idx}_{rect_hash}.jpg"
  159. s_out_rel_path = f"/DefectImage/{s_filename}"
  160. s_out_object_name = f"{settings.MINIO_BASE_PREFIX}{s_out_rel_path}"
  161. s_url = ""
  162. try:
  163. minio_client.stat_object(settings.MINIO_BUCKET, s_out_object_name)
  164. s_url = settings.get_full_url(s_out_rel_path)
  165. except Exception:
  166. if s_img_path:
  167. s_url = crop_defect_image(s_img_path, min_rect, s_filename)
  168. if s_url:
  169. defect_img_url_list.append({
  170. "image_type": s_img_type,
  171. "url": s_url
  172. })
  173. defect["defectImgUrls"] = defect_img_url_list
  174. logger.info(
  175. "耗时埋点 _process_defects_for_json: card_id=%s image_id=%s side=%s defects=%s elapsed_ms=%.2f",
  176. card_id, img_id, side, len(defects), (perf_counter() - start_time) * 1000
  177. )
  178. def _process_images_to_xy_format(
  179. card_data: dict,
  180. generate_related_images: bool = True
  181. ):
  182. """
  183. 内部辅助函数:遍历卡牌数据中的图片,将 JSON 格式转换为前端需要的 XY 格式。
  184. 直接修改传入的 card_data 字典。
  185. """
  186. start_time = perf_counter()
  187. card_id = card_data.get("id")
  188. all_images = card_data.get("images", [])
  189. if all_images:
  190. for img in all_images:
  191. d_internal = img.detection_json
  192. if isinstance(d_internal, str):
  193. d_internal = json.loads(d_internal)
  194. if d_internal:
  195. _process_defects_for_json(
  196. card_id, img.id, img.image_path, d_internal, img.image_type, all_images,
  197. generate_related_images=generate_related_images
  198. )
  199. img.detection_json = convert_internal_to_xy_format(d_internal)
  200. else:
  201. img.detection_json = convert_internal_to_xy_format({})
  202. m_internal = img.modified_json
  203. if isinstance(m_internal, str):
  204. m_internal = json.loads(m_internal)
  205. if m_internal:
  206. _process_defects_for_json(
  207. card_id, img.id, img.image_path, m_internal, img.image_type, all_images,
  208. generate_related_images=generate_related_images
  209. )
  210. img.modified_json = convert_internal_to_xy_format(m_internal)
  211. else:
  212. m_fallback = copy.deepcopy(d_internal) if d_internal else {}
  213. img.modified_json = convert_internal_to_xy_format(m_fallback)
  214. logger.info(
  215. "耗时埋点 _process_images_to_xy_format: card_id=%s image_count=%s elapsed_ms=%.2f",
  216. card_id, len(all_images), (perf_counter() - start_time) * 1000
  217. )
  218. return card_data
  219. @router.get("/query", response_model=CardDetailResponse, summary="获取卡牌详细信息(格式化xy), 支持前后翻页 [用户调用]")
  220. def get_card_details(
  221. card_id: int = Query(..., description="基准卡牌ID"),
  222. mode: QueryMode = Query(QueryMode.current, description="查询模式: current(当前), next(下一个), prev(上一个)"),
  223. db_conn: PooledMySQLConnection = db_dependency
  224. ):
  225. """
  226. 获取卡牌元数据以及所有与之关联的图片信息,并将坐标转换为 xy 格式。
  227. 同时返回上一张和下一张卡牌的ID。
  228. - **current**: 查询 card_id 对应的卡牌。
  229. - **next**: 查询 ID 比 card_id 大的第一张卡牌。
  230. - **prev**: 查询 ID 比 card_id 小的第一张卡牌。
  231. """
  232. target_id = card_id
  233. cursor = None
  234. start_time = perf_counter()
  235. try:
  236. cursor = db_conn.cursor(dictionary=True)
  237. # 1. 如果是查询上一个或下一个,先计算目标ID
  238. if mode != QueryMode.current:
  239. if mode == QueryMode.next:
  240. query_target = (f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} "
  241. f"WHERE id > %s ORDER BY id ASC LIMIT 1")
  242. else: # mode == QueryMode.prev
  243. query_target = (f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} "
  244. f"WHERE id < %s ORDER BY id DESC LIMIT 1")
  245. cursor.execute(query_target, (card_id,))
  246. row = cursor.fetchone()
  247. if not row:
  248. msg = "没有下一张" if mode == QueryMode.next else "没有上一张"
  249. # 边界场景返回 404,避免与 response_model=CardDetailResponse 冲突
  250. raise HTTPException(status_code=404, detail=msg)
  251. target_id = row['id']
  252. # 2. 获取目标卡牌的详细数据 (Dict 格式)
  253. card_data = crud_card.get_card_with_details(db_conn, target_id)
  254. if not card_data:
  255. raise HTTPException(status_code=404, detail=f"ID为 {target_id} 的卡牌未找到。")
  256. # 3. 补充当前目标卡牌的 id_prev 和 id_next
  257. # 注意:这里需要重新获取 cursor,或者使用 cursor (非 dict 模式可能更方便取值,但 dict 模式也行)
  258. # 这里为了简单直接用 raw SQL
  259. # 查询上一个ID
  260. sql_prev = f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} WHERE id < %s ORDER BY id DESC LIMIT 1"
  261. cursor.execute(sql_prev, (target_id,))
  262. row_prev = cursor.fetchone()
  263. card_data['id_prev'] = row_prev['id'] if row_prev else None
  264. # 查询下一个ID
  265. sql_next = f"SELECT id FROM {settings.DB_CARD_TABLE_NAME} WHERE id > %s ORDER BY id ASC LIMIT 1"
  266. cursor.execute(sql_next, (target_id,))
  267. row_next = cursor.fetchone()
  268. card_data['id_next'] = row_next['id'] if row_next else None
  269. # 4. 遍历图片,转换格式 (使用抽取出的辅助函数)
  270. _process_images_to_xy_format(
  271. card_data,
  272. generate_related_images=True
  273. )
  274. # 5. 将 images 从 Pydantic 对象转为 dict,避免 model_validate 重复验证导致类型异常
  275. if "images" in card_data:
  276. card_data["images"] = [
  277. img.model_dump() if hasattr(img, 'model_dump') else img
  278. for img in card_data["images"]
  279. ]
  280. # 6. 验证并返回
  281. return CardDetailResponse.model_validate(card_data)
  282. except HTTPException:
  283. raise
  284. except Exception as e:
  285. logger.error(f"查询卡牌详情失败 (Mode: {mode}, BaseID: {card_id}): {e}")
  286. raise HTTPException(status_code=500, detail="数据库查询失败")
  287. finally:
  288. logger.info(
  289. "耗时埋点 get_card_details: base_card_id=%s target_card_id=%s mode=%s elapsed_ms=%.2f",
  290. card_id, target_id, mode, (perf_counter() - start_time) * 1000
  291. )
  292. if cursor:
  293. cursor.close()
  294. @router.put("/update/json/{id}", status_code=200, summary="接收xy格式, 还原后重计算分数并保存 [用户调用]")
  295. async def update_image_modified_json(
  296. id: int,
  297. new_json_data: dict = Body(..., description="前端传来的包含xy对象格式的JSON"),
  298. current_user: dict = Depends(get_current_user),
  299. db_conn: PooledMySQLConnection = db_dependency
  300. ):
  301. """
  302. 接收前端传来的特殊格式 JSON (points 为对象列表)。
  303. 1. 将格式还原为后端标准格式 (points 为 [[x,y]])。
  304. 2. 根据 id 获取 image_type。
  305. 3. 调用外部接口重新计算分数。
  306. 4. 更新 modified_json。
  307. """
  308. card_id_to_update = None
  309. cursor = None
  310. # *** 1. 格式还原 ***
  311. # 将前端的 xy dict 格式转回 [[x,y]]
  312. internal_json_payload = convert_xy_to_internal_format(new_json_data)
  313. try:
  314. cursor = db_conn.cursor(dictionary=True)
  315. # 2. 获取图片信息
  316. cursor.execute(
  317. f"SELECT image_type, card_id, detection_json, modified_json "
  318. f"FROM {settings.DB_IMAGE_TABLE_NAME} WHERE id = %s",
  319. (id,)
  320. )
  321. row = cursor.fetchone()
  322. if not row:
  323. raise HTTPException(status_code=404, detail=f"ID为 {id} 的图片未找到。")
  324. card_id_to_update = row["card_id"]
  325. check_card_permission(db_conn, current_user, card_id_to_update)
  326. image_type = row["image_type"]
  327. # 针对融合图,在调用外部服务算分时直接把它当成对应的 ring 图
  328. # 否则它在映射表里是 None,会导致报错
  329. target_score_type = image_type
  330. if image_type == ImageType.front_fusion.value:
  331. target_score_type = ImageType.front_ring.value
  332. elif image_type == ImageType.back_fusion.value:
  333. target_score_type = ImageType.back_ring.value
  334. score_type = IMAGE_TYPE_TO_SCORE_TYPE.get(target_score_type)
  335. if not score_type:
  336. raise HTTPException(status_code=400, detail=f"未知的 image_type: {image_type}")
  337. # 3. 准备重算 payload:以库内原始 JSON 为底稿,仅覆盖编辑后的 defects
  338. # 对 fusion 图,score_type 会映射到 ring;此时底稿也应优先使用 ring 图 JSON,
  339. # 否则 fusion 图常见的空框结构会导致算分服务在 ring 逻辑下越界。
  340. source_json_str = row["modified_json"] if row["modified_json"] else row["detection_json"]
  341. if image_type in (ImageType.front_fusion.value, ImageType.back_fusion.value):
  342. target_ring_type = (
  343. ImageType.front_ring.value
  344. if image_type == ImageType.front_fusion.value
  345. else ImageType.back_ring.value
  346. )
  347. cursor.execute(
  348. f"SELECT detection_json, modified_json FROM {settings.DB_IMAGE_TABLE_NAME} "
  349. f"WHERE card_id = %s AND image_type = %s LIMIT 1",
  350. (card_id_to_update, target_ring_type)
  351. )
  352. ring_row = cursor.fetchone()
  353. if ring_row:
  354. source_json_str = ring_row["modified_json"] if ring_row["modified_json"] else ring_row["detection_json"]
  355. else:
  356. logger.warning(
  357. "fusion图重算未找到对应ring底稿,回退到当前图: image_id=%s card_id=%s image_type=%s target_ring_type=%s",
  358. id, card_id_to_update, image_type, target_ring_type
  359. )
  360. if isinstance(source_json_str, str):
  361. source_json_data = json.loads(source_json_str)
  362. else:
  363. source_json_data = source_json_str if isinstance(source_json_str, dict) else {}
  364. payload_for_recalculate = _prepare_recalculate_payload(internal_json_payload, source_json_data)
  365. _defects = payload_for_recalculate.get("result", {}).get("defect_result", {}).get("defects", [])
  366. _sanitize_defects_for_recalculate(_defects)
  367. logger.info(f"开始计算分数 (ID: {id}, Type: {score_type})")
  368. # 4. 调用远程计算接口
  369. try:
  370. response = await run_in_threadpool(
  371. lambda: requests.post(
  372. settings.SCORE_RECALCULATE_ENDPOINT,
  373. params={"score_type": score_type},
  374. json=payload_for_recalculate,
  375. timeout=20
  376. )
  377. )
  378. except Exception as e:
  379. logger.error(
  380. "调用分数计算服务失败(update/json): image_id=%s card_id=%s score_type=%s endpoint=%s error=%s",
  381. id, card_id_to_update, score_type, settings.SCORE_RECALCULATE_ENDPOINT, e,
  382. exc_info=True
  383. )
  384. raise HTTPException(status_code=500, detail=f"调用分数计算服务失败: {e}")
  385. if response.status_code != 200:
  386. logger.error(
  387. "分数计算接口返回错误(update/json): image_id=%s card_id=%s score_type=%s endpoint=%s status=%s body=%s",
  388. id, card_id_to_update, score_type, settings.SCORE_RECALCULATE_ENDPOINT, response.status_code, response.text
  389. )
  390. raise HTTPException(status_code=response.status_code,
  391. detail=f"分数计算接口返回错误: {response.text}")
  392. logger.info("分数计算完成")
  393. # 获取计算服务返回的结果(这个结果通常已经是标准的 internal 格式,带有分数和面积)
  394. final_json_data = response.json()
  395. # 5. 保存结果到数据库
  396. recalculated_json_str = json.dumps(final_json_data, ensure_ascii=False)
  397. update_query = (f"UPDATE {settings.DB_IMAGE_TABLE_NAME} "
  398. f"SET modified_json = %s, is_edited = TRUE "
  399. f"WHERE id = %s")
  400. cursor.execute(update_query, (recalculated_json_str, id))
  401. db_conn.commit()
  402. logger.info(f"图片ID {id} 的 modified_json 已更新并重新计算。")
  403. # 更新对应的 cards 的分数状态
  404. try:
  405. crud_card.update_card_scores_and_status(db_conn, card_id_to_update)
  406. logger.info(f"卡牌 {card_id_to_update} 的分数和状态已更新。")
  407. except Exception as score_update_e:
  408. logger.error(f"更新卡牌 {card_id_to_update} 分数失败: {score_update_e}")
  409. # 更新卡牌审核状态
  410. try:
  411. with db_conn.cursor() as cursor:
  412. review_state = 2
  413. # 更新指定 card_id 的 review_state 字段
  414. # 注意:MySQL 在“值未变化”时 rowcount 可能为 0,这不代表记录不存在。
  415. query_update = f"UPDATE {settings.DB_CARD_TABLE_NAME} SET review_state = %s WHERE id = %s"
  416. cursor.execute(query_update, (review_state, card_id_to_update))
  417. if cursor.rowcount == 0:
  418. cursor.execute(f"SELECT 1 FROM {settings.DB_CARD_TABLE_NAME} WHERE id = %s LIMIT 1",
  419. (card_id_to_update,))
  420. if not cursor.fetchone():
  421. raise HTTPException(status_code=404, detail=f"ID为 {card_id_to_update} 的卡牌未找到。")
  422. db_conn.commit()
  423. logger.info(f"卡牌 ID {card_id_to_update} 的审核状态已成功修改为 {review_state}。")
  424. except Exception as e:
  425. db_conn.rollback()
  426. logger.error(f"修改卡牌 {id} 审核状态失败: {e}")
  427. if isinstance(e, HTTPException):
  428. raise e
  429. raise HTTPException(status_code=500, detail="修改审核状态失败,数据库操作错误。")
  430. return {
  431. "detail": f"成功更新图片ID {id} 的JSON数据",
  432. "image_type": image_type,
  433. "score_type": score_type
  434. }
  435. except HTTPException:
  436. db_conn.rollback()
  437. raise
  438. except Exception as e:
  439. db_conn.rollback()
  440. logger.error(f"更新JSON失败 ({id}): {e}")
  441. raise HTTPException(status_code=500, detail=f"更新JSON数据失败: {e}")
  442. finally:
  443. if cursor:
  444. cursor.close()
  445. # 处理灰度如
  446. @router.put("/update/json_gray/{id}", status_code=200, summary="[灰度] 接收xy格式, 合并至Ring图重计算并保存 [用户调用]")
  447. async def update_gray_image_json(
  448. id: int,
  449. new_json_data: dict = Body(..., description="前端传来的灰度图编辑后的JSON(xy格式)"),
  450. current_user: dict = Depends(get_current_user),
  451. db_conn: PooledMySQLConnection = db_dependency
  452. ):
  453. """
  454. 针对灰度图 (front_gray/back_gray) 的保存逻辑。
  455. """
  456. cursor = None
  457. # 1. 格式还原
  458. internal_gray_json = convert_xy_to_internal_format(new_json_data)
  459. gray_defects = internal_gray_json.get("result", {}).get("defect_result", {}).get("defects", [])
  460. # 丢弃前端展示用的辅助字段,防止传给算分服务导致报错
  461. for d in gray_defects:
  462. if d.get("label") == "slight_scratch":
  463. d["label"] = "scratch"
  464. d.pop("defectImgUrl", None)
  465. d.pop("defectImgUrls", None)
  466. try:
  467. cursor = db_conn.cursor(dictionary=True)
  468. # 2. 获取辅助图(灰度图/融合图)信息
  469. # 以前只查 card_gray_images,现在融合图是在 card_images 表里
  470. # 先查 card_gray_images
  471. cursor.execute(f"SELECT card_id, image_type FROM {settings.DB_GRAY_IMAGE_TABLE_NAME} WHERE id = %s", (id,))
  472. gray_row = cursor.fetchone()
  473. if not gray_row:
  474. # 如果灰度表没找到,去主表找找看是不是融合图
  475. cursor.execute(f"SELECT card_id, image_type FROM {settings.DB_IMAGE_TABLE_NAME} WHERE id = %s AND image_type IN ('front_fusion', 'back_fusion')", (id,))
  476. gray_row = cursor.fetchone()
  477. if not gray_row:
  478. raise HTTPException(status_code=404, detail=f"ID为 {id} 的辅助图未找到。")
  479. card_id = gray_row['card_id']
  480. check_card_permission(db_conn, current_user, card_id)
  481. gray_image_type = gray_row['image_type']
  482. # 3. 确定目标 Ring 图类型
  483. target_ring_type = None
  484. if gray_image_type in (ImageType.front_gray.value, ImageType.front_fusion.value):
  485. target_ring_type = ImageType.front_ring.value
  486. elif gray_image_type in (ImageType.back_gray.value, ImageType.back_fusion.value):
  487. target_ring_type = ImageType.back_ring.value
  488. else:
  489. raise HTTPException(status_code=400, detail=f"不支持的辅助图类型: {gray_image_type}")
  490. # 4. 获取目标 Ring 图数据 (Card Images 表)
  491. cursor.execute(
  492. f"SELECT id, detection_json, modified_json FROM {settings.DB_IMAGE_TABLE_NAME} "
  493. f"WHERE card_id = %s AND image_type = %s",
  494. (card_id, target_ring_type)
  495. )
  496. ring_row = cursor.fetchone()
  497. if not ring_row:
  498. raise HTTPException(status_code=404, detail=f"未找到对应的 Ring 图 ({target_ring_type}),无法应用修改。")
  499. ring_image_id = ring_row['id']
  500. # 优先使用 modified_json,如果没有则使用 detection_json
  501. source_json_str = ring_row['modified_json'] if ring_row['modified_json'] else ring_row['detection_json']
  502. if isinstance(source_json_str, str):
  503. ring_json_data = json.loads(source_json_str)
  504. else:
  505. ring_json_data = source_json_str
  506. # 5. 合并逻辑 (Merge Logic)
  507. # 确保路径存在
  508. if "result" not in ring_json_data: ring_json_data["result"] = {}
  509. if "defect_result" not in ring_json_data["result"]: ring_json_data["result"]["defect_result"] = {}
  510. if "defects" not in ring_json_data["result"]["defect_result"]: ring_json_data["result"]["defect_result"][
  511. "defects"] = []
  512. ring_defects = ring_json_data["result"]["defect_result"]["defects"]
  513. # 遍历灰度图传来的新缺陷列表
  514. for new_defect in gray_defects:
  515. is_fusion = gray_image_type in (ImageType.front_fusion.value, ImageType.back_fusion.value)
  516. key_to_check = "fusion_id" if is_fusion else "gray_id"
  517. identifier = new_defect.get(key_to_check)
  518. # 只有带有对应标识的才进行特殊合并处理
  519. # 如果没有,视作普通新缺陷直接添加
  520. if not identifier:
  521. ring_defects.append(new_defect)
  522. continue
  523. # 在 Ring 图现有的缺陷中寻找匹配的标识
  524. match_index = -1
  525. for i, old_defect in enumerate(ring_defects):
  526. if old_defect.get(key_to_check) == identifier:
  527. match_index = i
  528. break
  529. if match_index != -1:
  530. # 存在:替换 (Replace)
  531. ring_defects[match_index] = new_defect
  532. else:
  533. # 不存在:添加 (Append)
  534. ring_defects.append(new_defect)
  535. # 6. 调用计算服务 (对 Ring 图数据进行重算)
  536. score_type = IMAGE_TYPE_TO_SCORE_TYPE.get(target_ring_type) # e.g., 'front_ring'
  537. logger.info(f"开始重计算 Ring 图分数 (GrayID: {id} -> RingID: {ring_image_id}, Type: {score_type})")
  538. try:
  539. response = await run_in_threadpool(
  540. lambda: requests.post(
  541. settings.SCORE_RECALCULATE_ENDPOINT,
  542. params={"score_type": score_type},
  543. json=ring_json_data, # 发送合并后的 Ring 数据
  544. timeout=20
  545. )
  546. )
  547. except Exception as e:
  548. logger.error(
  549. "调用分数计算服务失败(update/json_gray): gray_id=%s ring_id=%s card_id=%s score_type=%s endpoint=%s error=%s",
  550. id, ring_image_id, card_id, score_type, settings.SCORE_RECALCULATE_ENDPOINT, e,
  551. exc_info=True
  552. )
  553. raise HTTPException(status_code=500, detail=f"调用分数计算服务失败: {e}")
  554. if response.status_code != 200:
  555. logger.error(
  556. "分数计算接口返回错误(update/json_gray): gray_id=%s ring_id=%s card_id=%s score_type=%s endpoint=%s status=%s body=%s",
  557. id, ring_image_id, card_id, score_type, settings.SCORE_RECALCULATE_ENDPOINT, response.status_code, response.text
  558. )
  559. raise HTTPException(status_code=response.status_code,
  560. detail=f"分数计算接口返回错误: {response.text}")
  561. final_ring_json = response.json()
  562. # 7. 保存结果到数据库 (保存到 Ring 图记录)
  563. final_json_str = json.dumps(final_ring_json, ensure_ascii=False)
  564. update_query = (
  565. f"UPDATE {settings.DB_IMAGE_TABLE_NAME} "
  566. f"SET modified_json = %s, is_edited = TRUE "
  567. f"WHERE id = %s"
  568. )
  569. cursor.execute(update_query, (final_json_str, ring_image_id))
  570. db_conn.commit()
  571. logger.info(f"Ring 图 {ring_image_id} 已根据灰度图 {id} 的修改进行了更新。")
  572. # 8. 更新卡牌总分状态
  573. try:
  574. crud_card.update_card_scores_and_status(db_conn, card_id)
  575. except Exception as e:
  576. logger.error(f"更新卡牌 {card_id} 分数状态失败: {e}")
  577. # 更新卡牌审核状态
  578. try:
  579. with db_conn.cursor() as cursor:
  580. review_state = 2
  581. # 更新指定 card_id 的 review_state 字段
  582. # 注意:MySQL 在 “值未变化” 的情况下 rowcount 可能为 0,但这不代表记录不存在。
  583. query_update = f"UPDATE {settings.DB_CARD_TABLE_NAME} SET review_state = %s WHERE id = %s"
  584. cursor.execute(query_update, (review_state, card_id))
  585. if cursor.rowcount == 0:
  586. cursor.execute(f"SELECT 1 FROM {settings.DB_CARD_TABLE_NAME} WHERE id = %s LIMIT 1", (card_id,))
  587. if not cursor.fetchone():
  588. raise HTTPException(status_code=404, detail=f"ID为 {card_id} 的卡牌未找到。")
  589. db_conn.commit()
  590. logger.info(f"卡牌 ID {card_id} 的审核状态已成功修改为 {review_state}。")
  591. except Exception as e:
  592. db_conn.rollback()
  593. logger.error(f"修改卡牌 {id} 审核状态失败: {e}")
  594. if isinstance(e, HTTPException):
  595. raise e
  596. raise HTTPException(status_code=500, detail="修改审核状态失败,数据库操作错误。")
  597. return {
  598. "detail": f"成功应用灰度图修改到 {target_ring_type}",
  599. "target_ring_id": ring_image_id,
  600. "gray_id": id
  601. }
  602. except HTTPException:
  603. db_conn.rollback()
  604. raise
  605. except Exception as e:
  606. db_conn.rollback()
  607. logger.error(f"灰度图更新失败 ({id}): {e}")
  608. raise HTTPException(status_code=500, detail=f"系统内部错误: {e}")
  609. finally:
  610. if cursor:
  611. cursor.close()