Explorar el Código

气象站数据转发监视

yf_ymm hace 5 años
padre
commit
ce6fb0b6d4
Se han modificado 3 ficheros con 54 adiciones y 5 borrados
  1. 31 2
      apps/AppInfo/admin.py
  2. 13 0
      apps/AppInfo/models.py
  3. 10 3
      apps/Equipment/views.py

+ 31 - 2
apps/AppInfo/admin.py

@@ -6,7 +6,7 @@ from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 # Register your models here.
 from apps.AppInfo.models import MyUser, QXZdata, QXZstatus, Equip, Equip_type, QXZdata_New, JKdata, Article, Video_data,Product,Blog,QXZstatus_New,QXZswitchstatus,QXZswitchdata,\
 CKArticle,GardenManage,GardenArea,Areacrop,Store_Manage,Hotel_Info,Hotel_Photo,FarmUser,FarmList,Pick_Pub,Sell_Manage,Person_Pick,QXZAutoswitch, Pic_Info,Sightsee_Info,QXZ_Alarm_Log,\
-Experts, Relations
+Experts, Relations, QXZ_Alarm
 
 
 
@@ -842,4 +842,33 @@ class RelationsAdmin(admin.ModelAdmin):
     # 搜索项:
     search_fields = ['name']
     # 设置每页显示记录数:
-    list_per_page = 10    
+    list_per_page = 10
+
+
+
+
+# 合作伙伴表
+@admin.register(QXZ_Alarm)
+class QXZ_AlarmAdmin(admin.ModelAdmin):
+    actions_on_bottom = False
+    actions_on_top = True
+    # 详情显示项:
+    fields = [
+        'equip_id',
+        'conf',
+        'tel',
+        'upl_time',
+    ]
+    # 列表显示项:
+    list_display = [
+        'equip_id',
+        'conf',
+        'tel',
+        'upl_time',
+    ]
+    # 筛选过滤项:
+    list_filter = ('upl_time',)
+    # 搜索项:
+    search_fields = ['name']
+    # 设置每页显示记录数:
+    list_per_page = 10

+ 13 - 0
apps/AppInfo/models.py

@@ -92,6 +92,19 @@ class QXZstatus(models.Model):
         verbose_name_plural = verbose_name
         ordering = ['-equip_id__equip_add_time']
         get_latest_by = 'equip_id__equip_add_time'
+        
+# 气象站短信预警
+class QXZ_Alarm(models.Model):
+    equip_id = models.ForeignKey(Equip)
+    conf = models.TextField(u'短信配置', blank=True, null=True)
+    tel = models.CharField(u'手机号',max_length=20, blank=True)
+    upl_time = models.DateTimeField(u'上报时间', auto_now=True)
+
+    class Meta:
+        verbose_name = u"气象站短信预警"
+        verbose_name_plural = verbose_name
+        ordering = ['-upl_time']
+        get_latest_by = 'upl_time'
 
 
 

+ 10 - 3
apps/Equipment/views.py

@@ -24,7 +24,7 @@ from apps.AppInfo.models import (
     Hotel_Info, Hotel_Photo, JKdata, MyUser, Pick_Pub, Product, QXZdata,
     QXZdata_New, QXZstatus, QXZstatus_New, QXZswitchdata, QXZswitchstatus,
     Video_data,GardenArea,Store_Manage,Areacrop,Sell_Manage,Person_Pick,QXZAutoswitch,Sightsee_Info,Pic_Info,
-    QXZ_Alarm_Log,Experts,Relations)
+    QXZ_Alarm_Log,Experts,Relations,QXZ_Alarm)
 from apps.Equipment.all_dict import qxz_dict
 
 
@@ -2989,7 +2989,14 @@ class QXZ_Warning_View(ListView):
         equip_list = Equip.objects.filter(equip_user=current_user,equip_type=5)
         return render(request, 'backstageNet/warn/warnSet.html', context={"equip_list":equip_list})
     def post(self,request):
-        pass
+        equip_id = request.POST.get('equip_id')
+        try:
+            alarm = QXZ_Alarm.objects.get(equip_id=equip_id).conf
+        except:
+            alarm = ""
+        data = {"alarm":alarm}
+        data = json.dumps(data)
+        return HttpResponse(data)
 
 
 
@@ -3887,7 +3894,7 @@ class Equip_Location(ListView):
     def get(self,request):
         pass
     def post(self, request):
-        eid = request.POST.get("eid")
+        eid = request.POST.get("e_id")
         ename = request.POST.get("ename")
         lng = request.POST.get("lng")
         lat = request.POST.get("lat")