|
|
@@ -102,8 +102,8 @@ class DetectControllerViewV2(View):
|
|
|
tz = tz.replace("GMT", "")
|
|
|
detect_group = request_dict.get('detect_group', None)
|
|
|
interval = request_dict.get('interval', None)
|
|
|
- if not status:
|
|
|
- return response.json(444, 'status')
|
|
|
+ if not status and not electricity_status:
|
|
|
+ return response.json(444, 'status and electricity_status')
|
|
|
if not company_secrete:
|
|
|
return response.json(444, 'company_secrete')
|
|
|
company = CompanyModel.objects.filter(secret=company_secrete)
|
|
|
@@ -127,7 +127,6 @@ class DetectControllerViewV2(View):
|
|
|
else:
|
|
|
return response.json(173)
|
|
|
dvqs = Device_Info.objects.filter(userID_id=userID, UID=uid)
|
|
|
- status = int(status)
|
|
|
# 获取用户区域
|
|
|
# ip = self.ip
|
|
|
# ipInfo = CommonService.getIpIpInfo(ip=ip, lang='EN')
|
|
|
@@ -140,16 +139,18 @@ class DetectControllerViewV2(View):
|
|
|
nowTime = int(time.time())
|
|
|
if dvqs.exists():
|
|
|
# 修改状态
|
|
|
- dvqs.update(NotificationMode=status)
|
|
|
+ if status:
|
|
|
+ dvqs.update(NotificationMode=int(status))
|
|
|
uid_set_qs = UidSetModel.objects.filter(uid=uid)
|
|
|
# uid配置信息是否存在
|
|
|
|
|
|
if uid_set_qs.exists():
|
|
|
uid_set_id = uid_set_qs[0].id
|
|
|
qs_data = {
|
|
|
- 'detect_status': status,
|
|
|
'updTime': nowTime,
|
|
|
}
|
|
|
+ if status:
|
|
|
+ qs_data['detect_status'] = int(status)
|
|
|
if interval:
|
|
|
qs_data['detect_interval'] = int(interval)
|
|
|
if detect_group:
|
|
|
@@ -162,8 +163,9 @@ class DetectControllerViewV2(View):
|
|
|
'uid': uid,
|
|
|
'addTime': nowTime,
|
|
|
'updTime': nowTime,
|
|
|
- 'detect_status': status,
|
|
|
}
|
|
|
+ if status:
|
|
|
+ qs_data['detect_status'] = int(status)
|
|
|
if interval:
|
|
|
qs_data['detect_interval'] = int(interval)
|
|
|
if detect_group:
|
