四季采摘接口增加参数

apps/AppInfo/models.py

@@ -586,6 +586,31 @@ class Hotel_Info(models.Model):
 
     def __str__(self):
         return self.name
+
+
+# 旅游信息表
+class Sightsee_Info(models.Model):
+    name = models.CharField(u'景点名字', max_length=20, blank=True, null=True)
+    price = models.CharField(u'景点价格', max_length=20, blank=True, null=True)
+    intro = models.CharField(u'景点简介',max_length=255, null=True, blank=True)
+    location = models.CharField(u'景点位置', max_length=50, blank=True, null=True)
+    sightsee_time = models.DateTimeField(u'景区开放时间',blank=True, null=True)
+    sightsee_img = models.CharField(u'景点图片', max_length=200, blank=True, null=True)
+    sightsee_tel = models.CharField(u'联系方式', max_length=20, blank=True, null=True)
+    upl_time = models.DateTimeField(u'发布时间',default=timezone.now)
+    # 是否隐藏
+    hidden = models.BooleanField(default=False,verbose_name="是否隐藏")
+    # 发布用户
+    author = models.ForeignKey(MyUser,verbose_name="作者")
+    content = RichTextUploadingField('景点详情',null=True, blank=True)
+
+    class Meta:
+        verbose_name = '景点信息表'
+        verbose_name_plural = verbose_name
+
+    def __str__(self):
+        return self.name
+
     
 
 

apps/Equipment/urls.py

@@ -19,7 +19,8 @@ from apps.Equipment.views import (
     Video_Check_List, Video_Detail, Video_List, Video_Photo, Video_Pub,
     Video_Upload,JKview,Person_Area_Pub,CropCount_View,Sell_Del,Pick_Del,
     Pick_New,Repertory_New_View,Park_Land,Contrast_Detail,Contrast_List,Person_View,Person_List,
-    Area_Create,Area_Map,Person_Limit,Limit_View,Expert,learnDepot,Create_User,Change_Pwd,Delete_User,User_Change_Pwd,QXZ_Auto,QXZ_Value_Mqtt,QXZ_Status2, QXZ_Report_Detail2)
+    Area_Create,Area_Map,Person_Limit,Limit_View,Expert,learnDepot,Create_User,Change_Pwd,Delete_User,User_Change_Pwd,QXZ_Auto,QXZ_Value_Mqtt,QXZ_Status2, QXZ_Report_Detail2,
+    Sightsee_Photo)
 
 app_name = 'Equipment'
 
@@ -142,7 +143,9 @@ urlpatterns = [
     url(r'^dorm_pub$', Dorm_Pub.as_view(), name='dorm_pub'),
     url(r'^news_pub$', News_Pub.as_view(), name='news_pub'),
 
-     url(r'^sightsee_pub$', Sightsee_Pub.as_view(), name='sightsee_pub'),
+    url(r'^sightsee_pub$', Sightsee_Pub.as_view(), name='sightsee_pub'),
+    
+    url(r'^sightsee_photo$', Sightsee_Photo.as_view(), name='sightsee_photo'),
 
     
     url(r'^video_check$', Video_Check.as_view(), name='video_check'),#视频审核

apps/Equipment/views.py

@@ -22,7 +22,7 @@ from apps.AppInfo.models import (
     Article, CKArticle, Equip, Equip_type, FarmList, FarmUser, GardenManage,
     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)
+    Video_data,GardenArea,Store_Manage,Areacrop,Sell_Manage,Person_Pick,QXZAutoswitch,Sightsee_Info)
 from apps.Equipment.all_dict import qxz_dict
 
 
@@ -1294,83 +1294,63 @@ class Dorm_Pub(ListView):
             return HttpResponse(data)
 
 
+
+# 旅游发布介绍图
+class Sightsee_Photo(ListView):
+    def get(self,request):
+        pass
+    def post(self,request):
+        sightsee_photos = request.FILES.get('sightsee_photos')
+        if sightsee_photos:
+            print("视频图片：", sightsee_photos)
+            sightsee_photos_dir = 'sightsee_photos/'
+            end_name = sightsee_photos.name.split('.')[-1]
+            # 判断如果路径不存在，即创建路径
+            if os.path.exists(sightsee_photos_dir) == False:
+                os.makedirs(sightsee_photos_dir)
+            img = Image.open(sightsee_photos)
+            now_time = time.strftime('%Y%m%d%H%M%S', time.localtime(time.time()))
+            pic_name = now_time + '.' + end_name
+            print("pic_name:", pic_name)
+            img.save(sightsee_photos_dir + pic_name)
+            sightsee_photos = sightsee_photos_dir + pic_name
+            print("sightsee_photos:",sightsee_photos)
+            data = {"code": 0,"msg": "","data": {"src": sightsee_photos}}
+        else:
+            sightsee_photos = "0"
+            data = {"code": 404,"msg": "","data": {"src": sightsee_photos}}
+        data = json.dumps(data)
+        return HttpResponse(data)
+
+
 # 旅游发布
 class Sightsee_Pub(ListView):
     def get(self,request):
         return render(request, 'backstageNet/info/SightseePub.html', context={})
     def post(self,request):
-        current_user = MyUser.objects.get(username="admin")
         name = request.POST.get('name')
         price = request.POST.get('price')
-        person = request.POST.get('person')
-        mobile = request.POST.get('mobile')
-        img_url = request.POST.get('img_url')
-        addr = request.POST.get('addr')
+        sightsee_tel = request.POST.get('mobile')
+        sightsee_img = request.POST.get('img_url')
+        sightsee_time = request.POST.get('time')
+        # 位置
         location = request.POST.get('location')
-        intro = request.POST.get('intro')
+        # 内容
         content = request.POST.get('content')
-        pic_list = request.POST.get('pic_list')
-        Hotel_id= request.POST.get("id")
-        if Hotel_id:
-            if Hotel_Info.objects.filter(id=Hotel_id).exists():
-                try:
-                    Hotel_Info.objects.filter(id=Hotel_id).update(
-                        name=name,
-                        price=price,
-                        intro=intro,
-                        addr=addr,
-                        location=location,
-                        person=person,
-                        hotel_img=img_url,
-                        hotel_tel=mobile,
-                        content=content,
-                        author=current_user,
-                        )
-                    data="1"
-                except Exception as e:
-                    print("-----------报错信息为-------------")
-                    print(e)
-                    data = "0"
-                if data == "1":
-                    try:
-                        hotel_obj = Hotel_Info.objects.get(name=name)
-                        pic_list = pic_list.split(',')
-                        for i in pic_list:
-                            Hotel_Photo.objects.filter(hotel=hotel_obj).update(hotel=hotel_obj,addr=i)
-                    except Exception as aa:
-                        print("滚动图保存错误")
-                        print(aa)
-            else:
-                data = "0"
-            return HttpResponse(data)
-        else:
-            try:
-                Hotel_Info.objects.create(
-                    name=name,
-                    price=price,
-                    intro=intro,
-                    addr=addr,
-                    location=location,
-                    person=person,
-                    hotel_img=img_url,
-                    hotel_tel=mobile,
-                    content=content,
-                    author=current_user)
-                data = "1"
-            except Exception as e:
-                print("-----------报错信息为-------------")
-                print(e)
-                data = "0"
-            if data == "1":
-                try:
-                    hotel_obj = Hotel_Info.objects.get(name=name)
-                    pic_list = pic_list.split(',')
-                    for i in pic_list:
-                        Hotel_Photo.objects.create(hotel=hotel_obj,addr=i)
-                except Exception as aa:
-                    print("滚动图保存错误")
-                    print(aa)
-            return HttpResponse(data)
+        # 简介
+        desc = request.POST.get('desc')
+        Sightsee_Info.objects.create(
+            name=name,
+            price=price,
+            location=location,
+            sightsee_time=sightsee_time,
+            sightsee_img=sightsee_img,
+            sightsee_tel=sightsee_tel,
+            content=content,
+            desc=desc)
+        data = "0"
+        return HttpResponse(data)
+
 
 # 视频审核
 class Video_Check(ListView):

requirements.txt

@@ -0,0 +1,16 @@
+certifi==2019.6.16
+chardet==3.0.4
+demjson==2.2.4
+Django==1.10.6
+django-ckeditor==5.7.1
+django-js-asset==1.2.2
+django-redis==4.7.0
+idna==2.6
+image==1.5.27
+paho-mqtt==1.3.1
+Pillow==5.0.0
+PyMySQL==0.8.0
+redis==3.2.1
+requests==2.18.4
+urllib3==1.22
+xmltodict==0.12.0