Browse Source

修改问卷答案字段

zhangdongming 3 years ago
parent
commit
0905f8b6a8
3 changed files with 10 additions and 7 deletions
  1. 4 4
      Ansjer/local_config/local_settings.py
  2. 4 2
      Controller/SurveysController.py
  3. 2 1
      Model/models.py

+ 4 - 4
Ansjer/local_config/local_settings.py

@@ -14,7 +14,7 @@ ALLOWED_HOSTS = ['*']
 ADDR_URL = []
 ANONYMOUS_USER_ID = -1  # 支持匿名用户
 
-STATIC_URL = '/static/'
+STATIC_URL = '/static/static/'
 STATICFILES_DIRS = (os.path.join(BASE_DIR,'static'),)
 
 # 上传路径根目录
@@ -100,13 +100,13 @@ WSGI_APPLICATION = 'Ansjer.local_config.local_wsgi.application'
 DATABASE_DATA = 'ansjer_test'
 SERVER_HOST = '127.0.0.1'
 DATABASES_USER = 'root'
-DATABASES_PASS = 'root'
+DATABASES_PASS = 'password'
 
 # 推送数据库
-DATABASE_DATA2 = 'ansjerpush'
+DATABASE_DATA2 = 'ansjer_push_test'
 SERVER_HOST2 = '127.0.0.1'
 DATABASES_USER2 = 'root'
-DATABASES_PASS2 = 'root'
+DATABASES_PASS2 = 'password'
 
 # 序列号公共数据库
 # DATABASE_DATA3 = 'ansjer_test'

+ 4 - 2
Controller/SurveysController.py

@@ -105,6 +105,8 @@ class SurveysView(View):
 
     def answer_save(self, userId, ip, request_dict, response):
         try:
+            ipInfo = CommonService.getIpIpInfo(ip, "CN")
+            country_name = ipInfo['country_name']
             no = request_dict.get('no', None)
             if not no:
                 return response.json(10, 'no is null')
@@ -124,10 +126,10 @@ class SurveysView(View):
                     topicD = request_dict.get('topicD', None)
                     topicF = request_dict.get('topicF', None)
                     createdTime = int(time.time())
-                    answer = CloudVodSurveysAnswer(title_id=survey_title.id, user_id=userId, ip=ip, answer_1=score,
+                    answer = CloudVodSurveysAnswer(title_id=survey_title.id, user_id=userId, ip=ip, answer_1=int(score),
                                                    answer_2=topicA,
                                                    answer_3=topicB, answer_4=topicC, answer_5=topicD, answer_6=topicF,
-                                                   created_time=createdTime)
+                                                   created_time=createdTime, country_name=country_name)
                     answer.save()
             return response.json(0)
         except Exception as e:

+ 2 - 1
Model/models.py

@@ -2001,13 +2001,14 @@ class CloudVodSurveysAnswer(models.Model):
     title = models.ForeignKey(SurveysTitle, to_field='id', default='', on_delete=models.CASCADE, verbose_name='关联题目表ID')
     user = models.ForeignKey(Device_User, to_field='userID', default='', on_delete=models.CASCADE,
                              verbose_name='关联用户表ID')
-    answer_1 = models.CharField(max_length=500, blank=True, verbose_name='答案1', default='')
+    answer_1 = models.IntegerField(verbose_name='答案1 (分数)', default='')
     answer_2 = models.CharField(max_length=500, blank=True, verbose_name='答案2', default='')
     answer_3 = models.CharField(max_length=500, blank=True, verbose_name='答案3', default='')
     answer_4 = models.CharField(max_length=500, blank=True, verbose_name='答案4', default='')
     answer_5 = models.CharField(max_length=500, blank=True, verbose_name='答案5', default='')
     answer_6 = models.CharField(max_length=500, blank=True, verbose_name='答案6', default='')
     ip = models.CharField(max_length=32, default='', db_index=True, blank=True, verbose_name=u'访问ip地址')
+    country_name = models.CharField(max_length=20, default='', verbose_name='国家名')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')
 
     class Meta: