From 4cce7e8ef16be9b6b5a0f06a1fdc7309057ea5d6 Mon Sep 17 00:00:00 2001 From: liuyebo <1515783401@qq.com> Date: Mon, 9 Sep 2024 11:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=82=E6=8A=B9=E5=92=8C=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=BC=98=E5=85=88=E7=BA=A7=E6=A6=82?= =?UTF-8?q?=E5=BF=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- photo_mask/auto_photo_mask.py | 1 + photo_review/auto_photo_review.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3c555d0..dbb329b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ x-env: &template - image: fcb_photo_review:1.14.3 + image: fcb_photo_review:1.14.4 restart: always x-review: diff --git a/photo_mask/auto_photo_mask.py b/photo_mask/auto_photo_mask.py index b016f7a..fd1c18d 100644 --- a/photo_mask/auto_photo_mask.py +++ b/photo_mask/auto_photo_mask.py @@ -258,6 +258,7 @@ def main(): .join(ZxPhrec, ZxPhhd.pk_phhd == ZxPhrec.pk_phhd, isouter=True) .filter(ZxPhhd.paint_flag == "1") .filter(ZxPhrec.pk_phrec.isnot(None)) + .order_by(ZxPhhd.priority_num.desc()) .distinct().limit(PHHD_BATCH_SIZE).all()) # 将状态改为正在涂抹中 pk_phhd_values = [phhd.pk_phhd for phhd in phhds] diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py index 5ca5d6f..e4bd981 100644 --- a/photo_review/auto_photo_review.py +++ b/photo_review/auto_photo_review.py @@ -507,6 +507,7 @@ def main(): .join(ZxPhrec, ZxPhhd.pk_phhd == ZxPhrec.pk_phhd, isouter=True) .filter(ZxPhhd.exsuccess_flag == "1") .filter(ZxPhrec.pk_phrec.isnot(None)) + .order_by(ZxPhhd.priority_num.desc()) .distinct().limit(PHHD_BATCH_SIZE).all()) # 将状态改为正在识别中 pk_phhd_values = [phhd.pk_phhd for phhd in phhds]