formate_xy.py 32 KB

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