修复检验茧票不保存僵蚕数量的问题；修改实验室仪评指标联检测为版本V2

bbit_ai/app/db/postgres.py

@@ -471,7 +471,7 @@ def get_ticket_image_list(user_id):
                 SELECT created_at, file_name, resolution, size, name,
                        moisture_content, cocoon_weight, defective_pupa_count,
                        fresh_shell_weight, sample_count, barcode, oss,
-                       net_weight_total, evaluator, reviewer,id
+                       net_weight_total, evaluator, reviewer,id ,dead_pupa_count 
                 FROM ticket_images
                 WHERE created_by = %s
                 """,
@@ -498,6 +498,7 @@ def get_ticket_image_list(user_id):
                         "evaluator": row[13],
                         "reviewer": row[14],
                         "id": row[15],
+                        "dead_pupa_count": row[16],
                     }
                 )
             return result

bbit_ai/app/routers/Vision.py

@@ -49,3 +49,22 @@ def cocoonTicket(user_id: UUID = Depends(get_user_id_from_token)):
     if not user_id:
         return {"error": "userId is required"}
     return BaseResponse(data=pg.get_ticket_image_list(user_id))
+
+
+@visionRouter.post("/createTicketImageTaskV2")
+async def createTicketImageTask(
+    file: UploadFile = File(...),
+    projectName: str = Form(...),
+    user_id: UUID = Depends(get_user_id_from_token),
+):
+    if not user_id:
+        return {"error": "userId is required"}
+    try:
+        contents = await file.read()
+        json_data = await MyUtils.async_task(
+            process_ticket_image, 2, True, contents, file.filename, projectName, user_id
+        )
+        return BaseResponse(data=json_data)
+    except Exception as e:
+        print(str(e))
+        return BaseResponse(status=False, message=f"解析失败: {str(e)}", data=None)

bbit_ai/app/service/vision.py

@@ -51,8 +51,8 @@ def process_ticket_image(
         resolution=resolution,
         size=size_kb,
         name=project_name if project_name else object_name[:8],
-        dead_pupa_count=json_data.get("moisture_content") if version == 2 else 0,
+        dead_pupa_count=json_data.get("dead_pupa_count") if version == 2 else 0,
-        moisture_content=json_data.get("moisture_content"),
+        moisture_content=json_data.get("moisture_content") if version == 2 else 0,
         cocoon_weight=json_data.get("cocoon_weight"),
         defective_pupa_count=json_data.get("defective_pupa_count"),
         fresh_shell_weight=json_data.get("fresh_shell_weight"),

vue/apps/web-antd/src/api/cv/ticket.ts

@@ -11,7 +11,7 @@ export async function refreshTicketImageList() {
  * 上传图片分析任务
  */
 export async function createTicketImageTask(formData: FormData) {
-  return pyRequestClient.post('/llm/createTicketImageTask', formData, {
+  return pyRequestClient.post('/llm/createTicketImageTaskV2', formData, {
     headers: {
       'Content-Type': 'multipart/form-data',
     },

vue/apps/web-antd/src/views/cv/ticket/index.vue

@@ -44,7 +44,8 @@ function refreshLineChart() {
   showInfoStr2.value = {
     含水量: `${data.moisture_content} %`,
     下足茧重: `${data.cocoon_weight} g`,
-    '非蛹/僵蚕': `${data.defective_pupa_count} 粒`,
+    非蛹粒数: `${data.defective_pupa_count} 粒`,
+    僵蛹粒数: `${data.dead_pupa_count} 粒`,
     鲜壳量: `${data.fresh_shell_weight} g`,
     小样数: `${data.sample_count} 粒`,
     净重合计: `${data.net_weight_total} kg`,