xuguoyang 7 месяцев назад
Родитель
Сommit
1afbc11269
2 измененных файлов с 25 добавлено и 13 удалено
  1. 17 5
      routers/api/riskMonitor/forest_fire_condition.py
  2. 8 8
      utils/risk/__init__.py

+ 17 - 5
routers/api/riskMonitor/forest_fire_condition.py

@@ -40,19 +40,31 @@ async def mine(request: Request,db: Session = Depends(get_db)):
 
 
 
+# def get_warning_description(level):
+#     if level == 1:
+#         return "无危险"
+#     elif level == 2:
+#         return "较低危险"
+#     elif level == 3:
+#         return "中等危险"
+#     elif level == 4:
+#         return "高火险级"
+#     elif level == 5:
+#         return "最高火险级"
+#     else:
+#         return "未知等级"
+
 def get_warning_description(level):
     if level == 1:
         return "无危险"
     elif level == 2:
         return "较低危险"
     elif level == 3:
-        return "中等危险"
+        return "较高危险"
     elif level == 4:
-        return "高火险级"
+        return "高度危险"
     elif level == 5:
-        return "最高火险级"
-    else:
-        return "未知等级"
+        return "季度危险"
 
 
 @router.post('/forest_warrning')

+ 8 - 8
utils/risk/__init__.py

@@ -150,7 +150,7 @@ LIMIT 1;
 
 
 def get_max_forest_level(db):
-    sql = '''
+    sql = text('''
         SELECT MAX(subquery.warning_level) as max_level
         FROM (
             SELECT 
@@ -162,14 +162,14 @@ def get_max_forest_level(db):
                 `forest_fire`
         ) AS subquery
         WHERE rn = 1;
-    '''
+    ''')
     sqlresult = db.execute(sql).first()[0]
     return sqlresult
 
 
 def get_forest_warring(db):
     result = []
-    sql=''' SELECT *
+    sql=text(''' SELECT *
         FROM (
             SELECT 
                 AREA_NAME,
@@ -180,7 +180,7 @@ def get_forest_warring(db):
                 `forest_fire`
         ) AS subquery
         WHERE rn = 1;
-				    '''
+				    ''')
     sqlresult = db.execute(sql)
     for i in sqlresult:
         print(i)
@@ -195,7 +195,7 @@ def get_forest_warring(db):
 
 
 def get_max_hazardous_level(db):
-    sql = '''
+    sql = text('''
         SELECT MAX(subquery.warning_level) as max_level
         FROM (
             SELECT 
@@ -207,14 +207,14 @@ def get_max_hazardous_level(db):
                 `hazardous_chemicals`
         ) AS subquery
         WHERE rn = 1;
-    '''
+    ''')
     sqlresult = db.execute(sql).first()[0]
     return sqlresult
 
 
 def get_hazardous_warring(db):
     result = []
-    sql=''' SELECT *
+    sql=text(''' SELECT *
         FROM (
             SELECT 
                 AREA_NAME,
@@ -225,7 +225,7 @@ def get_hazardous_warring(db):
                 `hazardous_chemicals`
         ) AS subquery
         WHERE rn = 1;
-				    '''
+				    ''')
     sqlresult = db.execute(sql)
     for i in sqlresult:
         print(i)