Эх сурвалжийг харах

更新设备获取时区接口

lang 4 жил өмнө
parent
commit
2e631d4239

+ 8 - 4
Controller/EquipmentStatus.py

@@ -113,9 +113,8 @@ def getTZ(request):
         uid = c.decode('utf-8')
         if len(uid) == 20:
             print(uid)
-            redisObject = RedisObject(db=7)
-            data = redisObject.get_data(key=ip)
-
+            # redisObject = RedisObject(db=7)
+            # data = redisObject.get_data(key=ip)
             if data:
                 info = json.loads(data)
                 return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': info})
@@ -131,10 +130,15 @@ def getTZ(request):
                     if ':' not in gmtz:
                         gmtz = gmtz + ':00'
                     info['gmt_offset'] = gmtz
+                if len(tz) == 6:
+                    gmtz = tz.replace('UTC-', 'GMT-').replace('UTC+', 'GMT+')
+                    if ':' not in gmtz:
+                        gmtz = gmtz + ':00'
+                    info['gmt_offset'] = gmtz
                 elif len(tz) == 8:
                     gmtz = tz.replace('UTC-', 'GMT-0').replace('UTC+', 'GMT+0')
                     info['gmt_offset'] = gmtz
-                redisObject.set_data(key=ip, val=json.dumps(info), expire=3600)
+                # redisObject.set_data(key=ip, val=json.dumps(info), expire=3600)
             except Exception as e:
                 pass
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': info})