会议室接口调整

webmain/task/openapi/openmeetAction.php

@@ -34,10 +34,21 @@ class openmeetClassAction extends openapiAction
         $meetData = $this->db->getall($sqlStr);
 
         if (count($meetData) == 0) {
-            $this->showreturn(["meeting_list"=>[],"basic_information"=>[],"meetingTopic"=>[],"participants"=>[]], "暂无会议", 203);
+            $this->showreturn(
+                ["meeting_list"=>[],
+                    "basic_information"=>[
+                        "meeting_room_name" => "空闲中",
+                        "meeting_name" => null,
+                        "meeting_time" => null,
+                        "meeting_moderator" => null,
+                    ],
+                    "meetingTopic"=>[],
+                    "participants"=>[]
+                ],
+                "暂无会议",
+                203);
         }
 
-
         $data = [];
 
         for ($i = 0; $i < count($meetData); $i++) {
@@ -51,12 +62,24 @@ class openmeetClassAction extends openapiAction
             ];
 
             // 时间到了自动结束一下
-            if ($meeting['end_time'] < date("Y-m-d H:i:s")) {
+            if (strtotime($meeting['end_time']) < strtotime(date("Y-m-d H:i:s"))) {
                 if ($meeting['type'] == 1) {
                     m("meeting")->update(["meet_state"=>2], "id=".$meeting['id']);
                 } else {
                     m("meeting_key")->update(["meet_state"=>2], "id=".$meeting['id']);
                 }
+            } else if (strtotime($meeting['start_time']) > strtotime(date("Y-m-d H:i:s"))) {
+                if ($meeting['type'] == 1) {
+                    m("meeting")->update(["meet_state"=>0], "id=".$meeting['id']);
+                } else {
+                    m("meeting_key")->update(["meet_state"=>0], "id=".$meeting['id']);
+                }
+            } else if (strtotime($meeting['start_time']) < strtotime(date("Y-m-d H:i:s"))) {
+                if ($meeting['type'] == 1) {
+                    m("meeting")->update(["meet_state"=>1], "id=".$meeting['id']);
+                } else {
+                    m("meeting_key")->update(["meet_state"=>1], "id=".$meeting['id']);
+                }
             }
         }
 
@@ -66,16 +89,17 @@ class openmeetClassAction extends openapiAction
              SELECT 2 as type, id, title, start_time, end_time, compere, meet_state, meeting_room  FROM `xinhu_meeting_key` where start_time < now() and end_time > now() and meeting_room = '".$rawData['room_name']."'";
         $nowMeetingData = $this->db->getall($nowMeetingSql);
 
-//        return $nowMeetingSql;
 
         if (count($nowMeetingData) > 0) {
             $nowMeet = $nowMeetingData[0];
+
             $data['$basic_information'] = [
                 "meeting_room_name" => $nowMeet['meeting_room'],
                 "meeting_name" => $nowMeet['title'],
                 "meeting_time" => date("H:i", strtotime($nowMeet['start_time'])).' ~ '.date("H:i", strtotime($nowMeet['end_time'])),
                 "meeting_moderator" => $nowMeet['compere'],
             ];
+
             if ($nowMeet['type'] == 2) {
                 $topics = $this->db->getall("select `id`, `topic_title`, `topic_attendee`, `topic_state`, `topic_info` from `[Q]meeting_topics` where mid = {$nowMeet['id']} order by sort");
                 $this_topics = [];
@@ -106,16 +130,16 @@ class openmeetClassAction extends openapiAction
                 $data['participants'][] = $next_topics;
 
             } else {
+                $data['$basic_information'] = [
+                    "meeting_room_name" => "空闲中",
+                    "meeting_name" => null,
+                    "meeting_time" => null,
+                    "meeting_moderator" => null,
+                ];
                 $data['meetingTopic'] = [];
                 $data['participants'] = [];
             }
         } else {
-            $data['$basic_information'] = [
-                "meeting_room_name" => "空闲中",
-                "meeting_name" => null,
-                "meeting_time" => null,
-                "meeting_moderator" => null,
-            ];
             $data['meetingTopic'] = [];
             $data['participants'] = [];
         }