会议室接口调整

webmain/flow/input/mode_meetingAction.php

@@ -13,8 +13,7 @@ class mode_meetingClassAction extends inputAction{
 	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
 	*/
 	protected function savebefore($table, $arr, $id, $addbo){
-//        if(arrvalue($arr,'type')=='1')return ''; //固定会议不需要判断
-        return m('meeting')->isapplymsg($arr['start_time'], $arr['end_time'], $arr['meeting_room'], $id);
+        return m('meeting')->isapplymsg($arr['start_time'], $arr['end_time'], $arr['meeting_room'], $id, 1);
 	}
 	
 	/**

webmain/flow/input/mode_meeting_keyAction.php

@@ -14,7 +14,7 @@ class mode_meeting_keyClassAction extends inputAction{
 	*/
 	protected function savebefore($table, $arr, $id, $addbo){
         // 检查会议是否冲突
-        return m('meeting')->isapplymsg($arr['start_time'], $arr['end_time'], $arr['meeting_room'], $id);
+        return m('meeting')->isapplymsg($arr['start_time'], $arr['end_time'], $arr['meeting_room'], $id, 2);
 	}
 	
 	/**

webmain/model/flow/meeting_keyModel.php

@@ -114,10 +114,10 @@ class flow_meeting_keyClassModel extends flowModel
             }
             m('meeting_key')->update($data, "id={$this->id}");
 
-            $topic = m('meeting_topics')->getone("mid={$this->id}", "id", 'sort desc');
-            if (isset($topic['id'])) {
-                m('meeting_topics')->update(['topic_state'=>'2'], 'id='.$topic['id']);
-            }
+//            $topic = m('meeting_topics')->getone("mid={$this->id}", "id", 'sort desc');
+//            if (isset($topic['id'])) {
+//                m('meeting_topics')->update(['topic_state'=>'2'], 'id='.$topic['id']);
+//            }
         } else if ($ors['num'] == 'disenableMeeting') {
 
 //            $data = [

webmain/model/meetingModel.php

@@ -15,37 +15,27 @@ class meetingClassModel extends Model
     /**
      *	判断会议室是否重复申请了
      */
-//    public function isapplymsg($startdt, $enddt, $hyname, $id=0)
-//    {
-//        $msg 		= '';
-//        $rows 		= $this->getall("id <> '$id' and `meet_state` in(0,1)");
-////        $gdrow		= m('flow')->initflow('meeting')->createmeet(0, substr($startdt,0,10) ,true);//从固定会议中读取
-////        foreach($gdrow as $k1=>$rs1)$rows[]=$rs1;
-//
-//        foreach($rows as $k=>$rs){
-//            if($rs['meeting_room'] != $hyname)continue;
-//            $sdt = $rs['start_time'];
-//            $edt = $rs['end_time'];
-//            if(
-//                ($sdt<=$startdt && $edt>$startdt)
-//                || ($sdt<$enddt && $edt>=$enddt)
-//                || ($sdt>$startdt && $edt<$enddt)
-//                || ($sdt==$startdt && $edt==$enddt)
-//            )$msg = '该会议室的时间段已被申请过了，主题“'.$rs['title'].'”';
-//        }
-//        return $msg;
-//    }
 
 
-    public function isapplymsg($startdt, $enddt, $hyname, $id=0)
+    public function isapplymsg($startdt, $enddt, $hyname, $id=0, $meetType=1)
     {
         $msg 		= '';
-        $sql        =  /** @lang text */
-            'select id, meeting_room, start_time, end_time 
-               from xinhu_meeting  where id <> {$id} and meet_state in (0, 1)
-             union all
-             select id, meeting_room, start_time, end_time 
-               from xinhu_meeting_key where id <> {$id} and meet_state in (0, 1)';
+        if ($meetType == 1) {
+            $sql        =  /** @lang text */
+                'select id, meeting_room, start_time, end_time, title
+                   from xinhu_meeting  where id <> '.$id.' and meet_state in (0, 1)
+                 union all
+                 select id, meeting_room, start_time, end_time, title
+                   from xinhu_meeting_key where meet_state in (0, 1)';
+        } else {
+            $sql        =  /** @lang text */
+                'select id, meeting_room, start_time, end_time, title
+                   from xinhu_meeting  where meet_state in (0, 1)
+                 union all
+                 select id, meeting_room, start_time, end_time, title 
+                   from xinhu_meeting_key where id <> '.$id.' and meet_state in (0, 1)';
+        }
+        m('log')->addlog("验证", $sql);
 
         $rows 		= $this->db->getall($sql);
 
@@ -53,6 +43,7 @@ class meetingClassModel extends Model
             if($rs['meeting_room'] != $hyname)continue;
             $sdt = $rs['start_time'];
             $edt = $rs['end_time'];
+            m('log')->addlog("验证", json_encode($rs));
             if(
                 ($sdt<=$startdt && $edt>$startdt)
                 || ($sdt<$enddt && $edt>=$enddt)

webmain/task/openapi/openmeetAction.php

@@ -12,44 +12,15 @@ class openmeetClassAction extends openapiAction
         return json_encode($str);
     }
 
-    // 绑定设备
-    public function bindDeviceAction() {
-        $rawArr = $this->getpostarr();
-
-        if (!isset($rawArr['device_id'])) {
-            $this->showreturn([], "参数错误", -1);
-        }
-
-        $rawData = m('meeting_room')->getone(" mac like '%{$rawArr['device_id']}%'", "id, room_name");
-
-        $meetData = m('meeting')->getone(" status = 1 and meet_state = 1 and meeting_room = '{$rawData['room_name']}'");
-
-        $now = date('Y年m月d日('.$this->getWeek().') H:i');
-
-        if ($rawData['id'] ?? 0 > 0) {
-            $data = [
-                "room_id"=>$rawData['id'],
-                "meetingRoomName"=>$rawData['room_name'],
-                "meetingTime"=>$now,
-                "stateText"=>isset($meetData['id']) ? "会议中" : "空闲中",
-                "meetingState"=>isset($meetData['id']),
-                "meetingId"=>$meetData['id'] ?? null,
-            ];
-            $this->showreturn($data, "请求成功");
-        } else {
-            $this->showreturn([], "设备未绑定", 0);
-        }
-    }
-
     // 获取会议信息
     public function getMeetInfoAction() {
         $rawArr = $this->getpostarr();
 
-        if (!isset($rawArr['room_id'])) {
+        if (!isset($rawArr['device_id'])) {
             $this->showreturn([], "参数错误", 201);
         }
 
-        $rawData = m('meeting_room')->getone(" id = '{$rawArr['room_id']}'");
+        $rawData = m('meeting_room')->getone(" mac = '{$rawArr['device_id']}'");
 
         if (!isset($rawData['room_name'])) {
             $this->showreturn([], "未找到会议室", 202);
@@ -152,12 +123,6 @@ class openmeetClassAction extends openapiAction
         $this->showreturn($data, "请求成功");
     }
 
-    // 切换议题
-    public function switchTopicsAction() {
-        $rawArr = $this->getpostarr();
-
-        $this->showreturn($rawArr,'请求成功!');
-    }
 
     protected function getWeek($date=null) {
         if (!isset($date)) {