1

app/Model/ScheduleInfo.php

@@ -11,4 +11,5 @@ class ScheduleInfo extends Model
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
     const not_use = 0;
+    const limit_key = "scheduleInfo";
 }

app/Service/ScheduleService.php

@@ -228,8 +228,8 @@ class ScheduleService extends Service
         $schedule = $this->changeDateToDate($data['schedule']);
         $model = Schedule::TopClear($user,$data);
         $schedule_id = $model->where('del_time',0)
-            ->where('start_time', '>=', $schedule)
-            ->where('end_time', '<=', $schedule)
+            ->where('start_time', '<=', $schedule)
+            ->where('end_time', '>=', $schedule)
             ->select('id')->get()->toArray();
         $schedule_id = array_column($schedule_id,'id');
         if(empty($schedule_id)) return [false,'该时间排班设置不存在或已被删除！'];
@@ -247,7 +247,11 @@ class ScheduleService extends Service
             if(isset($return[$value['start_time'] . $value['end_time']])){
                 $return[$value['start_time'] . $value['end_time']]['num'] += 1;
             }else{
+                $tmp['schedule_id'] = $value['schedule_id'];
                 $tmp['num'] = 1;
+                $tmp['day_stamp'] = $value['day'];
+                $tmp['day_start_stamp'] = $value['start_time'];
+                $tmp['day_end_stamp'] = $value['end_time'];
                 $tmp['day'] = date('Y-m-d',$value['day']);
                 $tmp['start_time'] = date('H:i',$value['start_time']);
                 $tmp['end_time'] = date('H:i',$value['end_time']);

app/Service/Service.php

@@ -239,9 +239,10 @@ class Service
 
     //后台端 某些需要限制请求频率的接口
     //需要主动删除  Redis::del($key)
-    public function limitingSendRequestBackg($key){
+    public function limitingSendRequestBackg($key,$value=0){
+        if(! empty($value)) $value = 1;
         // 使用Redis Facade设置，当键名不存在时才设置成功
-        if (Redis::setnx($key, 1)) return [true, ''];
+        if (Redis::setnx($key, $value)) return [true, ''];
 
         return [false,'操作频繁！'];
     }