会议状态标识

webmain/task/openapi/openmeetAction.php

@@ -25,6 +25,8 @@ class openmeetClassAction extends openapiAction
 
         $rawData = m('meeting_room')->getone(" mac like '%{$rawArr['device_id']}%'", "id, room_name");
 
+        $meetData = m('meeting')->getone(" state = 1 and meeting_room = '{$rawData['room_name']}'");
+
         $now = date('Y年m月d日('.$this->getWeek().') H:i:s');
 
         if ($rawData['id'] ?? 0 > 0) {
@@ -35,7 +37,9 @@ class openmeetClassAction extends openapiAction
                     "room_id"=>$rawData['id'],
                     "meetingRoomName"=>$rawData['room_name'],
                     "meetingTime"=>$now,
-                    "stateText"=>"空闲中"
+                    "stateText"=>isset($meetData['id']) ? "会议中" : "空闲中",
+                    "meetingState"=>isset($meetData['id']),
+                    "meetingId"=>$meetData['id'] ?? null,
                 ]
             ];
         } else {
@@ -71,17 +75,16 @@ class openmeetClassAction extends openapiAction
         if (!isset($meetData['id'])) {
             return [
                 "code"=>2,
-                "message"=>"暂无会议！"
+                "message"=>"暂无会议！",
+                "data"=>[
+                    "meetingState"=>False
+                ]
             ];
         }
 
         $topics = $this->db->getall("select `id`, `topic_title`, `topic_attendee`, `topic_state` from `[Q]meeting_topics` where mid = {$meetData['id']} order by sort");
 
 
-        $now = date('Y年m月d日('.$this->getWeek($meetData['meeting_time']).') H:i:s');
-        $date = date('Y年m月d日('.$this->getWeek($meetData['meeting_time']).') H:i:s');
-        $datetime = "2021-09-30 15:45:30"; // 给定的日期时间字符串
-
         // 将日期时间字符串转换为UNIX时间戳
         $ts = strtotime($meetData['meeting_time']);
         // 根据需要格式化日期
@@ -108,7 +111,8 @@ class openmeetClassAction extends openapiAction
                 "meetingName"=>$meetData['title'],
                 "meetingTime"=>$meetDate,
                 "meetingPerson"=>explode(",", $meetData['attendees']),
-                "meetingTopic"=>$topicsList ?? []
+                "meetingTopic"=>$topicsList ?? [],
+                "meetingState"=>True
             ]
         ];
         return $res;