fix20220225

apps/utils/neo4j_conn.py

@@ -3,9 +3,9 @@ from py2neo import Graph
 
 
 def conn_neo4j():
 def conn_neo4j():
     # graph = Graph("http://localhost:7474", username="neo4j", password="123456")  # 本地neo4j
     # graph = Graph("http://localhost:7474", username="neo4j", password="123456")  # 本地neo4j
-    graph = Graph("http://localhost:7476", username="neo4j", password="123456")  # 上传到50服务器前需更改
+    # graph = Graph("http://localhost:7476", username="neo4j", password="123456")  # 上传到50服务器前需更改
     # graph = Graph("http://39.100.39.50:7476", username="neo4j", password="123456")  # 测试50服务器上的neo4j时使用
     # graph = Graph("http://39.100.39.50:7476", username="neo4j", password="123456")  # 测试50服务器上的neo4j时使用
-    # graph = Graph("http://39.100.39.50:7475", username="neo4j", password="century-english-almanac-havana-golf-9040")  # 太原的neo4j,测试是借用
+    graph = Graph("http://39.100.39.50:7475", username="neo4j", password="century-english-almanac-havana-golf-9040")  # 太原的neo4j,测试是借用
     return graph
     return graph
 
 
 
 

apps/view_atlas/view_es_con.py

@@ -5,6 +5,7 @@ from apps.view_atlas import api_atlas
 from apps.util import login_required
 from apps.util import login_required
 from apps.utils.response_code import RET
 from apps.utils.response_code import RET
 from apps.utils.neo4j_conn import conn_neo4j
 from apps.utils.neo4j_conn import conn_neo4j
+from ..models import Enterprise
 
 
 graph = conn_neo4j()
 graph = conn_neo4j()
 
 
@@ -369,14 +370,19 @@ def get_semic_map():
             companys_return = json.loads(requests.post(url=url, json=body).text)
             companys_return = json.loads(requests.post(url=url, json=body).text)
             companys.extend([i["_source"] for i in companys_return["hits"]["hits"]])
             companys.extend([i["_source"] for i in companys_return["hits"]["hits"]])
 
 
-        data = list()
+        data = {}
+        supplier = list()
         if companys:
         if companys:
             for item in companys:
             for item in companys:
-                data.append({"name": item["company_name"],
-                             "jwd": {"lng": item["lng"],  # 园区地址出的经纬度
-                                     "lat": item["lat"]}
+                supplier.append({"name": item["company_name"],
+                                 "value": [item["lng"], item["lat"]]
                                  })
                                  })
-
+        # 获取本公司的经纬度
+        enterprise = Enterprise.query.filter_by(company_name=company_name).first()
+        enterprise_lng = enterprise.lng
+        enterprise_lat = enterprise.lat
+        data['SupplyEnterprise'] = [{'name': company_name, "value": [enterprise_lng, enterprise_lat]}]
+        data['supplier'] = supplier
         return jsonify(code=RET.OK, msg="获取成功", data=data)
         return jsonify(code=RET.OK, msg="获取成功", data=data)
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)