Merge branch 'master' of http://code.nyzhwlw.com:3000/yf_fyh/bigdataAPI

apps/IOTCard/views.py

@@ -294,7 +294,7 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
                         save_data["所属平台"].append(device_info["plat"])
                         save_data["设备类型"].append(device_info["device_type"])
                         save_data["任务单号"].append(device_info["order_id"])
-                        save_data["所属用户"].append(device_info["owen_user"])
+                        save_data["所属用户"].append(device_info["owner_user"])
                         save_data["设备状态"].append(device_info["status"])
                         save_data["设备位置"].append(device_info["location"])
                     else:
@@ -386,6 +386,7 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
         save_filename = str(uuid.uuid4()) + ".xlsx"
         now_dir = os.path.dirname(__file__)
         save_path = os.path.join(now_dir, "excel_folder", save_filename)
+        print(save_path)
         df.to_excel(save_path, index=False)
         return Response(save_filename)
 

restart.sh

@@ -3,7 +3,7 @@
 source activate env_bigdataAPI
 
 DIR_NAME=$(cd `dirname "$0"`; pwd)
-SCRIPT_NAME="uwsgi.ini"
+SCRIPT_NAME="bigdataAPI.ini"
 SCRIPT_FILE="${DIR_NAME}/${SCRIPT_NAME}"
 
 function start_service() {

utils/utils.py

@@ -65,7 +65,7 @@ class GetDashujuSiqingDeviceInfo(object):
         # 大数据平台mongo连接 
         user = parse.quote_plus("root")
         passwd = parse.quote_plus("yfkj@6020")
-        da_shuju = "1270.0.01"
+        da_shuju = "127.0.0.1"
         si_qing = "172.16.220.3"
         myclient = pymongo.MongoClient("mongodb://{0}:{1}@{2}:57017/".format(user,passwd, da_shuju))
         db = myclient.smartfarming