zhangdongming 3 жил өмнө
parent
commit
4a99bc8da5

+ 18 - 5
Controller/SurveysController.py

@@ -16,6 +16,7 @@ from Object.TokenObject import TokenObject
 from Object.ResponseObject import ResponseObject
 from Model.models import Surveys, SurveysTitle, Order_Model, CloudVodSurveysAnswer, Device_User
 from Service.CommonService import CommonService
+import logging
 
 
 class SurveysView(View):
@@ -54,6 +55,8 @@ class SurveysView(View):
                 return response.json(token.code)
             ip = CommonService.get_ip_address(request)
             userID = token.userID
+            logger = logging.getLogger('info')
+            logger.info('this user id:{},dict{}'.format(userID, request_dict))
             return self.answer_save(userID, ip, request_dict, response)
 
         ''' 后台管理'''
@@ -215,13 +218,18 @@ class SurveysView(View):
     def title_save(self, request_dict, response):
         surveyId = request_dict.get('surveyId', None)
         if not surveyId:
-            return response(10, 'id is null')
+            return response(10, 'surveyId is null')
+        t_id = request_dict.get('id', None)
         content = request_dict.get('content', None)
         createdTime = int(time.time())
         try:
-            surveys_title = SurveysTitle(surveys_id=surveyId, title_content=content
-                                         , created_time=createdTime)
-            surveys_title.save()
+            title = SurveysTitle.objects.filter(id=t_id)
+            if title.exists():
+                title.update(title_content=content)
+            else:
+                surveys_title = SurveysTitle(surveys_id=surveyId, title_content=content
+                                             , created_time=createdTime)
+                surveys_title.save()
             return response.json(0)
         except Exception as e:
             print(e)
@@ -229,12 +237,17 @@ class SurveysView(View):
 
     def get_title_list(self, request_dict, response):
         surveyId = request_dict.get('surveyId', None)
+        info = request_dict.get('info', None)
         if not surveyId:
             return response.json(10, '问卷id不存在')
         title_list = SurveysTitle.objects.filter(surveys_id=surveyId).order_by('-created_time')
-        if not all(title_list):
+        if not title_list.exists():
+            if info:
+                return response.json(0, {'id': None, 'content': None})
             return response.json(173)
         content = title_list[0]
+        if info:
+            return response.json(0, {'id': content.id, 'content': content.title_content})
         data = json.loads(content.title_content)
         return response.json(0, {'answers': data})