|
@@ -71,7 +71,9 @@ class CronCloudPhotoView(View):
|
|
|
try:
|
|
try:
|
|
|
eq_qs = EquipmentInfoService.get_equipment_info_model(str(today))
|
|
eq_qs = EquipmentInfoService.get_equipment_info_model(str(today))
|
|
|
item = str(item, encoding="utf-8")
|
|
item = str(item, encoding="utf-8")
|
|
|
- eq_qs = eq_qs.filter(event_time__gt=time_stamp, is_st=1, device_uid=item) \
|
|
|
|
|
|
|
+ last_date = LocalDateTimeUtil.get_cur_month_end()
|
|
|
|
|
+ start_time, end_time = LocalDateTimeUtil.get_start_and_end_time(last_date, '%Y-%m-%d')
|
|
|
|
|
+ eq_qs = eq_qs.filter(event_time__gt=time_stamp, event_time__lt=end_time, is_st=1, device_uid=item) \
|
|
|
.values('device_uid', 'channel', 'event_time', 'device_nick_name')
|
|
.values('device_uid', 'channel', 'event_time', 'device_nick_name')
|
|
|
count = eq_qs.count()
|
|
count = eq_qs.count()
|
|
|
page = int(count / 2) if count > 1 else count
|
|
page = int(count / 2) if count > 1 else count
|
|
@@ -139,7 +141,11 @@ class CronCloudPhotoView(View):
|
|
|
for item in photo_qs:
|
|
for item in photo_qs:
|
|
|
try:
|
|
try:
|
|
|
with transaction.atomic():
|
|
with transaction.atomic():
|
|
|
- picture_qs = DevicePicturePushInfo.objects.filter(uid=item['uid'], event_time__gt=time_stamp,
|
|
|
|
|
|
|
+ last_date = LocalDateTimeUtil.get_cur_month_end()
|
|
|
|
|
+ start_time, end_time = LocalDateTimeUtil.get_start_and_end_time(last_date, '%Y-%m-%d')
|
|
|
|
|
+ picture_qs = DevicePicturePushInfo.objects.filter(uid=item['uid'],
|
|
|
|
|
+ event_time__gt=time_stamp,
|
|
|
|
|
+ event_time__lt=end_time,
|
|
|
type=0) \
|
|
type=0) \
|
|
|
.values('uid', 'channel', 'event_time', 'device_nick_name')
|
|
.values('uid', 'channel', 'event_time', 'device_nick_name')
|
|
|
if not picture_qs.exists():
|
|
if not picture_qs.exists():
|
