diff --git a/photo_mask/photo_mask.py b/photo_mask/photo_mask.py index ecbbe90..642d16b 100644 --- a/photo_mask/photo_mask.py +++ b/photo_mask/photo_mask.py @@ -245,9 +245,11 @@ def photo_mask(pk_phhd, name, id_card_num): def main(): while 1: session = MysqlSession() - phhds = session.query(ZxPhhd.pk_phhd, ZxPhhd.cXm, ZxPhhd.cSfzh).filter( - ZxPhhd.paint_flag == "1" - ).limit(PHHD_BATCH_SIZE).all() + phhds = (session.query(ZxPhhd.pk_phhd, ZxPhhd.cXm, ZxPhhd.cSfzh) + .join(ZxPhrec, ZxPhhd.pk_phhd == ZxPhrec.pk_phhd, isouter=True) + .filter(ZxPhhd.paint_flag == "1") + .filter(ZxPhrec.pk_phrec.isnot(None)) + .distinct().limit(PHHD_BATCH_SIZE).all()) # 将状态改为正在涂抹中 pk_phhd_values = [phhd.pk_phhd for phhd in phhds] update_flag = (update(ZxPhhd).where(ZxPhhd.pk_phhd.in_(pk_phhd_values)).values(paint_flag="2")) diff --git a/photo_review/photo_review.py b/photo_review/photo_review.py index 2daff95..b6ffe2f 100644 --- a/photo_review/photo_review.py +++ b/photo_review/photo_review.py @@ -278,7 +278,11 @@ def photo_review(pk_phhd): def main(): while 1: session = MysqlSession() - phhds = session.query(ZxPhhd.pk_phhd).filter(ZxPhhd.exsuccess_flag == '1').limit(PHHD_BATCH_SIZE).all() + phhds = (session.query(ZxPhhd.pk_phhd) + .join(ZxPhrec, ZxPhhd.pk_phhd == ZxPhrec.pk_phhd, isouter=True) + .filter(ZxPhhd.exsuccess_flag == "1") + .filter(ZxPhrec.pk_phrec.isnot(None)) + .distinct().limit(PHHD_BATCH_SIZE).all()) # 将状态改为正在识别中 pk_phhd_values = [phhd.pk_phhd for phhd in phhds] update_flag = (update(ZxPhhd).where(ZxPhhd.pk_phhd.in_(pk_phhd_values)).values(exsuccess_flag=2))