Procházet zdrojové kódy

PC获取序列号更改

chenshibin před 4 roky
rodič
revize
af7dff9bcc

+ 2 - 0
Ansjer/config.py

@@ -81,6 +81,8 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
     from Ansjer.config_test import *
 elif SERVER_TYPE == 'Ansjer.formal_settings':
     from Ansjer.config_formal import *
+else:
+    from Ansjer.config_local import *
 # type =2
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {

+ 3 - 3
Controller/SerialNumberController.py

@@ -140,12 +140,12 @@ class SerialNumberView(View):
             # 存在对应的企业
             company_serial_qs = company_serial_qs[0:quantity]
 
-            company_serial_qs = company_serial_qs.values('id', 'serial_number__serial_number', 'company__mark')
+            #company_serial_qs = company_serial_qs.values('id', 'serial_number__serial_number', 'company__mark')
             data = []
             ids = []
             for serial in company_serial_qs:
-                ids.append(serial['id'])
-                data.append(serial['serial_number__serial_number'] + serial['company__mark'])
+                ids.append(serial.id)
+                data.append(serial.serial_number.serial_number + serial.company.mark)
             CompanySerialModel.objects.filter(id__in=ids).update(status=1)
             redisObject.rpush(key, value)
             return response.json(0, data)

+ 7 - 0
Object/RedisObject.py

@@ -70,6 +70,13 @@ class RedisObject:
     def rpush(self, name, val):
         self.CONN.rpush(name, val)
 
+    def lpop(self, key):
+        val = self.CONN.lpop(key)
+        if val:
+            return val.decode('utf-8')
+        else:
+            return False
+
     # 获取列表长度
     def llen(self, name):
         return self.CONN.llen(name=name)