补充取消收藏报告接口

app/compare_views.py

@@ -72,3 +72,8 @@ def save_report_record_api():
 @app.route('/api/query_report_records', methods=['GET'])
 def query_report_records_api():
     return query_collect_report_record(request.args)
+
+
+@app.route('/api/del_report_record', methods=['GET'])
+def del_report_record_api():
+    return cancel_collect_report(request.args)

app/cross_compare_report.py

@@ -565,8 +565,7 @@ def query_collect_report_record(params):
     if not str(area_id).lstrip('-').isdigit() or int(area_id) not in area_list:
         return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
     report_type = check_param(params, 'report_type')
-    report_type = int(report_type)
+    if not report_type or int(report_type) not in (0, 1, 2, 3):
-    if not report_type or report_type not in(0, 1, 2, 3):
         # 0 对比报告 ，其余为预留
         return json.dumps(make_common_res(7, '缺少报告类型，请刷新后重试'))
     report_type = int(report_type)
@@ -576,3 +575,28 @@ def query_collect_report_record(params):
     res = make_common_res(0, 'ok')
     res['data'] = records
     return json.dumps(res, ensure_ascii=False)
+
+
+def cancel_collect_report(params):
+    nodeid = check_param(params, 'nodeid')
+    if not nodeid:
+        return json.dumps(make_common_res(2, '缺少nodeid， 请刷新后重试'))
+    area_id = check_param(params, 'area_id')
+    if not area_id:
+        return json.dumps(make_common_res(3, '缺少area_id， 请刷新后重试'))
+    userid = check_param(params, 'userid')
+    if not userid:
+        return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
+    area_list = db_user.query_areaid_list(userid)
+    if not area_list or len(area_list) < 1:
+        return json.dumps(make_common_res(5, '用户信息异常'))
+    area_list = map(int, area_list)
+    if not str(area_id).lstrip('-').isdigit() or int(area_id) not in area_list:
+        return json.dumps(make_common_res(5, '辖区id异常，请检查后重试'))
+    record_id = check_param(params, 'record_id')
+    if not record_id:
+        return json.dumps(make_common_res(6, '缺少记录id， 请刷新后重试'))
+    ret = db_tmnet.cancel_collect_report_sql(nodeid, area_id, record_id)
+    if not ret:
+        return json.dumps(make_common_res(7, '取消失败，请检查后重试'))
+    return json.dumps(make_common_res(0, 'ok'))

app/tmnet_db_func.py

@@ -808,3 +808,9 @@ class TmnetDbHelper(TableDbHelperBase):
             select * from cross_doctor_config.collect_report_record where nodeid = %s and area_id = %s and report_type = %s
         """ % (nodeid, area_id, report_type)
         return self.do_select(sql)
+
+    def cancel_collect_report_sql(self, nodeid, area_id, record_id):
+        sql = """
+            delete from cross_doctor_config.collect_report_record where nodeid = %s and area_id = %s and id = %s
+        """ % (nodeid, area_id, record_id)
+        return self.do_execute(sql)