气象站数据转发监视

apps/Equipment/all_dict.py

@@ -55,10 +55,14 @@ qxz_dict = {'100':['未定义',],
 '155':['155','氮','mg/kg'],
 '156':['156','磷','mg/kg'],
 '157':['157','钾','mg/kg'],
-'158':['158','NO2','ug/m3'],
-'159':['159','O3','ug/m3'],
-'160':['160','管道流量','m3/s'],
-'161':['161','流速','L/min'],
-'162':['162','管道压力','KPa'],
-'208':['208','照度','Lux']
+'158':['158','热通量','W/m2'],
+'159':['159','叶面温度','℃'],
+'160':['160','叶面湿度','%RH'],
+'161':['161','茎秆','mm'],
+'162':['162','负氧离子','个/cm3'],
+'201':['201','土壤水势','KPA'],
+'202':['202','露点温度','℃'],
+'203':['203','PM100','ug/m3'],
+'208':['208','照度','Lux'],
+'211':['211','电导率','uS/cm']
 }

apps/Equipment/views.py

@@ -4176,13 +4176,13 @@ class Add_Qxz_Test(ListView):
             if qxz_exist.exists():
                 print("<-----this equip is existed!----->")
                 try:
-                    e_id = Equip.objects.get(device_id=device_id)
+                    e_id = Equip.objects.get(equip_id=device_id)
                 except:
                     print("<-----this equip didn't exist!----->")      
                 try:
                     # 设备数据表直接储存数据
                     # QXZdata.objects.create(equip_id=e_id, qxz_data=extdata)
-                    QXZdata_New.objects.create(device_id=device_id,
+                    QXZdata_New.objects.create(equip_id=e_id,
                         e1=e1,e2=e2,e3=e3,e4=e4,e5=e5,e6=e6,e7=e7,e8=e8,e9=e9,e10=e10,
                         e11=e11,e12=e12,e13=e13,e14=e14,e15=e15,e16=e16,e17=e17,e18=e18,e19=e19,e20=e20,
                         e21=e21,e22=e22,e23=e23,e24=e24,e25=e25,e26=e26,e27=e27,e28=e28,e29=e29,e30=e30)
@@ -4191,10 +4191,10 @@ class Add_Qxz_Test(ListView):
                 except:
                     print("<-----data update failed!----->")
             
-                if QXZstatus_New.objects.filter(equip_id=device_id).exists():
+                if QXZstatus_New.objects.filter(equip_id=e_id).exists():
                     print("<-----this equip's status is existed!----->")
                     try:
-                        sta = QXZstatus_New.objects.get(equip_id=device_id)
+                        sta = QXZstatus_New.objects.get(equip_id=e_id)
                         
                         sta.e1 = e1
                         sta.e2 = e2
@@ -4235,7 +4235,7 @@ class Add_Qxz_Test(ListView):
                     # 设备状态表不存在、创建状态表：
                     print("<-----this equip's status is not existed!----->")
                     try:
-                        QXZstatus_New.objects.create(equip_id=device_id,
+                        QXZstatus_New.objects.create(equip_id=e_id,
                             e1=e1,e2=e2,e3=e3,e4=e4,e5=e5,e6=e6,e7=e7,e8=e8,e9=e9,e10=e10,
                             e11=e11,e12=e12,e13=e13,e14=e14,e15=e15,e16=e16,e17=e17,e18=e18,e19=e19,e20=e20,
                             e21=e21,e22=e22,e23=e23,e24=e24,e25=e25,e26=e26,e27=e27,e28=e28,e29=e29,e30=e30,is_online="1")
@@ -4245,14 +4245,14 @@ class Add_Qxz_Test(ListView):
                     except:
                         print("<-----this equip's status table re-create failed!----->")
                 # 判断标题配置表
-                if QXZ_Conf.objects.filter(equip_id=device_id).exists():
+                if QXZ_Conf.objects.filter(equip_id=e_id).exists():
                     print("------conf create default-------")
                 else:
-                    QXZ_Conf.objects.create(equip_id=device_id,
+                    QXZ_Conf.objects.create(equip_id=e_id,
                         e1=conf1,e2=conf2,e3=conf3,e4=conf4,e5=conf5,e6=conf6,e7=conf7,e8=conf8,e9=conf9,e10=conf10,
                         e11=conf11,e12=conf12,e13=conf13,e14=conf14,e15=conf15,e16=conf16,e17=conf17,e18=conf18,e19=conf19,e20=conf20,
                         e21=conf21,e22=conf22,e23=conf23,e24=conf24,e25=conf25,e26=conf26,e27=conf27,e28=conf28,e29=conf29,e30=conf30)
-                    QXZ_Default_Conf.objects.create(equip_id=device_id,
+                    QXZ_Default_Conf.objects.create(equip_id=e_id,
                         e1=conf1,e2=conf2,e3=conf3,e4=conf4,e5=conf5,e6=conf6,e7=conf7,e8=conf8,e9=conf9,e10=conf10,
                         e11=conf11,e12=conf12,e13=conf13,e14=conf14,e15=conf15,e16=conf16,e17=conf17,e18=conf18,e19=conf19,e20=conf20,
                         e21=conf21,e22=conf22,e23=conf23,e24=conf24,e25=conf25,e26=conf26,e27=conf27,e28=conf28,e29=conf29,e30=conf30)
@@ -4265,11 +4265,12 @@ class Add_Qxz_Test(ListView):
                 print("<-----this equip not existed!----->")
                 # 设备不存在，在设备列表中创建：
                 try:
-                    e_id = Equip.objects.create(equip_id=device_id, equip_type_id="5",addtime=times,uptime=times)
+                    e_type = Equip_type.objects.get(type_id="5")
+                    e_id = Equip.objects.create(equip_id=device_id, equip_type=e_type)
                     print("<-----this imei add successed!----->")
                     try:
                         # 设备数据表直接储存数据
-                        QXZdata_New.objects.create(equip_id=device_id,uptime=times,
+                        QXZdata_New.objects.create(equip_id=e_id,
                             e1=e1,e2=e2,e3=e3,e4=e4,e5=e5,e6=e6,e7=e7,e8=e8,e9=e9,e10=e10,
                             e11=e11,e12=e12,e13=e13,e14=e14,e15=e15,e16=e16,e17=e17,e18=e18,e19=e19,e20=e20,
                             e21=e21,e22=e22,e23=e23,e24=e24,e25=e25,e26=e26,e27=e27,e28=e28,e29=e29,e30=e30)
@@ -4278,7 +4279,7 @@ class Add_Qxz_Test(ListView):
                     except:
                         print("<-----data update failed!----->")
                     try:
-                        QXZstatus_New.objects.create(equip_id=device_id,uptime=times,
+                        QXZstatus_New.objects.create(equip_id=e_id,
                             e1=e1,e2=e2,e3=e3,e4=e4,e5=e5,e6=e6,e7=e7,e8=e8,e9=e9,e10=e10,
                             e11=e11,e12=e12,e13=e13,e14=e14,e15=e15,e16=e16,e17=e17,e18=e18,e19=e19,e20=e20,
                             e21=e21,e22=e22,e23=e23,e24=e24,e25=e25,e26=e26,e27=e27,e28=e28,e29=e29,e30=e30,is_online="1")
@@ -4288,14 +4289,14 @@ class Add_Qxz_Test(ListView):
                         print("<-----this imei register failed!----->")
                     
                     # 判断标题配置表
-                    if QXZ_Conf.objects.filter(equip_id=device_id).exists():
+                    if QXZ_Conf.objects.filter(equip_id=e_id).exists():
                         print("------conf create default-------")
                     else:
-                        QXZ_Conf.objects.create(equip_id=device_id,uptime=times,
+                        QXZ_Conf.objects.create(equip_id=e_id,uptime=times,
                             e1=conf1,e2=conf2,e3=conf3,e4=conf4,e5=conf5,e6=conf6,e7=conf7,e8=conf8,e9=conf9,e10=conf10,
                             e11=conf11,e12=conf12,e13=conf13,e14=conf14,e15=conf15,e16=conf16,e17=conf17,e18=conf18,e19=conf19,e20=conf20,
                             e21=conf21,e22=conf22,e23=conf23,e24=conf24,e25=conf25,e26=conf26,e27=conf27,e28=conf28,e29=conf29,e30=conf30)
-                        QXZ_Default_Conf.objects.create(equip_id=device_id,
+                        QXZ_Default_Conf.objects.create(equip_id=e_id,
                             e1=conf1,e2=conf2,e3=conf3,e4=conf4,e5=conf5,e6=conf6,e7=conf7,e8=conf8,e9=conf9,e10=conf10,
                             e11=conf11,e12=conf12,e13=conf13,e14=conf14,e15=conf15,e16=conf16,e17=conf17,e18=conf18,e19=conf19,e20=conf20,
                             e21=conf21,e22=conf22,e23=conf23,e24=conf24,e25=conf25,e26=conf26,e27=conf27,e28=conf28,e29=conf29,e30=conf30)
@@ -4328,8 +4329,8 @@ class Add_Qxz_Test(ListView):
                         e_id = Equip.objects.get(equip_id=device_id)
                     except:
                         print("<-----this equip didn't exist!----->")
-                    QXZ_Info_Record.objects.create(equip_id=device_id, volt=volt,rssi=rssi,uptime=times)
-                    if QXZ_Base_Info.objects.filter(equip_id=device_id).exists():
+                    QXZ_Info_Record.objects.create(equip_id=e_id, volt=volt,rssi=rssi)
+                    if QXZ_Base_Info.objects.filter(equip_id=e_id).exists():
                         print("<-----this qxz_base_info is existed!----->")
                         try:
                             sta = QXZ_Base_Info.objects.get(equip_id=device_id)
@@ -4360,10 +4361,10 @@ class Add_Qxz_Test(ListView):
                         # 设备阈值表不存在、创建阈值表：
                         print("<-----this qxz_base_info is not existed!----->")
                         try:
-                            QXZ_Base_Info.objects.create(equip_id=device_id, volt=volt,rssi=rssi,iccid=iccid,lng=lng,lat=lat,led=led,uptime=times)
+                            QXZ_Base_Info.objects.create(equip_id=device_id, volt=volt,rssi=rssi,iccid=iccid,lng=lng,lat=lat,led=led)
                             print("<-----this qxz_base_info table re-create successed!----->")
                         except:
                             print("<-----this qxz_base_info table re-create failed!----->")
         
         
-        return True
+        return HttpResponse("1")