chenjunkai 6 år sedan
förälder
incheckning
dff53ba956
1 ändrade filer med 38 tillägg och 12 borttagningar
  1. 38 12
      Controller/FeedBack.py

+ 38 - 12
Controller/FeedBack.py

@@ -1,8 +1,8 @@
 import time
-
+import json
 import oss2
 from django.views.generic.base import View
-
+from var_dump import var_dump
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Model.models import FeedBackModel, StatResModel
 from Object.ResponseObject import ResponseObject
@@ -33,6 +33,8 @@ class FeedBackView(View):
                 return self.do_get_upload_url(request_dict, response)
             elif operation == 'query':
                 return self.do_query(userID, request_dict, response)
+            elif operation == 'delete':
+                return self.do_delete(userID, request_dict, response)
             else:
                 return response.json(414)
         else:
@@ -56,12 +58,15 @@ class FeedBackView(View):
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         for fb in fb_qs:
             if fb['id'] in res:
-                img_url = bucket.sign_url('GET', fb['FS__name'], 600)
-                res[fb['id']]['img_url'].append(img_url)
+                if fb['FS__name']:
+                    img_url = bucket.sign_url('GET', fb['FS__name'], 600)
+                    res[fb['id']]['img_url'].append(img_url)
             else:
-                img_url = bucket.sign_url('GET', fb['FS__name'], 600)
-                fb['img_url'] = []
-                fb['img_url'].append(img_url)
+                print(fb['FS__name'])
+                if fb['FS__name']:
+                    img_url = bucket.sign_url('GET', fb['FS__name'], 600)
+                    fb['img_url'] = []
+                    fb['img_url'].append(img_url)
                 res[fb['id']] = fb
 
         # print(fb_qs.FS_set.all())
@@ -100,12 +105,33 @@ class FeedBackView(View):
 
     def do_get_upload_url(self, request_dict, response):
         uploadType = request_dict.get('uploadType', None)
-        if uploadType:
+        uploadType = json.loads(uploadType)
+        if len(uploadType):
+            res = []
             auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
             bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
-            name = CommonService.createOrderID()
-            obj = str(name) + '.' + uploadType
-            url = bucket.sign_url('PUT', obj, 7200)
-            return response.json(0, {'put_url': url, 'res_name': obj})
+            for upType in uploadType:
+                name = CommonService.createOrderID()
+                obj = str(name) + '.' + upType
+                url = bucket.sign_url('PUT', obj, 7200)
+                res.append({'put_url': url, 'res_name': obj})
+            return response.json(0, res)
         else:
             return response.json(444, 'uploadType')
+
+    def do_delete(self, userID, request_dict, response):
+        id = request_dict.get('id', None)
+        try:
+            print('==========')
+
+            fb_qs = FeedBackModel.objects.get(userID_id=userID, id=id)
+            from var_dump import var_dump
+
+            sss = fb_qs.FS.all()
+
+            var_dump(sss)
+            # fb_qs.delete()
+        except Exception as e:
+            return response.json(500, repr(e))
+        else:
+            return response.json(0)