gushoubang 9 сар өмнө
parent
commit
6288cf72d2
1 өөрчлөгдсөн 4 нэмэгдсэн , 3 устгасан
  1. 4 3
      app.py

+ 4 - 3
app.py

@@ -58,7 +58,7 @@ def inputMsg():
     districtName是选址范围,
     ydmjbegin是用地面积的开始值,是较小的那个数,ydmjend是用地面积的结束值,是较大的那个数,单位统一转换为亩
     yxyz中的name是因子选择,defalt是条件,defaultvalue是距离,公里、千米的单位转换为米,
-    请把这句话:"{msg}",转换为以下格式:"districtName": "抱坡区","landType": "居住用地","ydmjbegin":10,"ydmjend":100,"yxyz":[("name":"幼儿园服务半径","default":"小于","defaultValue":"500"),("name":"火葬场","default":"大于","defaultValue":"4000"),("name":"火葬场距离","default":"小于","defaultValue":"5000")],"useMultiple":false,"useLandType":true,"multipleDistance":0,
+    请把这句话:"{msg}",转换为以下格式:"districtName": "抱坡区","landType": "居住用地","ydmjbegin":10,"ydmjend":100,"yxyz":[("name":"幼儿园服务半径","default":"小于","defaultValue":"500"),("name":"火葬场","default":"大于","defaultValue":"4000"),("name":"火葬场距离","default":"小于","defaultValue":"5000")],"useMultiple":false,"useLandType":true,"multipleDistance":1000,
     并把condition中大于、小于、大于等于、小于等于、介于分别替换为gt、lt、get、let、between,然后把结果进行输出
     """
 
@@ -127,8 +127,8 @@ def jsonResToDict(json_res):
         #         }
         #     }
         # ],
-        "useMultiple": json_res["multipleDistance"],
-        "useLandType": json_res["multipleDistance"],
+        "useMultiple": json_res["useMultiple"],
+        "useLandType": json_res["useLandType"],
         "multipleDistance": json_res["multipleDistance"]
     }
     # 循环遍历输入因子
@@ -163,6 +163,7 @@ def jsonResToDict(json_res):
         if factorId in input_factors:
             res["yxyz"].append(input_factors[factorId])
         else:
+            factorTemplate["condition_info"]=json.loads(factorTemplate["condition_info"])
             res["yxyz"].append(factorTemplate)
     return res