diff --git a/app/db_cross_delay.py b/app/db_cross_delay.py index 92ba0c6..b75c28a 100644 --- a/app/db_cross_delay.py +++ b/app/db_cross_delay.py @@ -44,6 +44,8 @@ class CrossDbHelper(TableDbHelperBase): return self.do_select(sql) def query_crosses_examine_records(self, crossid_list, first_date, min_date): + if not crossid_list: + return [] crossids = ','.join(["'" + str(item) + "'" for item in crossid_list]) sql = """ select * from cross_doctor_matedata.cross_phase_problems_record where crossid in (%s) and first_date <= '%s' and (end_date >= '%s' or end_date is null) diff --git a/app/monitor_common.py b/app/monitor_common.py index 55bed98..9273e78 100644 --- a/app/monitor_common.py +++ b/app/monitor_common.py @@ -291,7 +291,7 @@ def gen_monitor_cross_ledger_info(routing_crosses, nodeid, area_id, slc_company_ inroadid_list = [item['roadid'] for item in all_crosses_inroads] cross_has_reverse_lane = db_tmnet.check_reverse_turn(inroadid_list) virtual_roads = db_tmnet.query_virtual_roads(crossid_list) - has_reverse_turn = int(cross_has_reverse_lane) + int(sum([item['reverse_turn'] for item in virtual_roads if item['reverse_turn']])) + has_reverse_turn = int(cross_has_reverse_lane) + int(sum([item['reverse_turn'] for item in virtual_roads if item['reverse_turn']])) if cross_has_reverse_lane else 0 reversible_lane_num = db_tmnet.calc_has_reversible_lane_crosses(crossid_list)[0]['num'] special_info = { 'reverse_turn': has_reverse_turn,