no message

api/application/controllers/Map.php

@@ -76,18 +76,18 @@ class Map extends Base_Controller{
 		switch ($type) {
 			case '1':   // 开灯
 				$filter['L.status'] = 1;
-				$filter['N.status'] = 1;
+				$filter['L.netstatus'] = 1;
 				break;  
 			case '2':   // 关灯
 				$filter['L.status'] = 0;
-				$filter['N.status'] = 1;
+				$filter['L.netstatus'] = 1;
 				break;  
 			case '3':	// 故障
 				$filter['L.isfaulted'] = 1;
 				break;
 			case '4':	// 离线
 				// $filter['AI.status !='] = 0;
-				$filter['N.status'] = 0;
+				$filter['L.netstatus'] = 0;
 				break;
 			// case '5':	// 监控
 			// 	// $filter['monitor'] = 1;
@@ -98,26 +98,27 @@ class Map extends Base_Controller{
 		}
 		if (!empty($type)) {
 			if ($type == 5) {
-				$data = $this->Videomonitor_model->get_data_by_location($role,0,$projectid,$userid,'id,longitude,latitude,image',$filter);
-				foreach ($data as &$s) {
-					$s['image'] = base_url($s['image']);
-					$s['is_video'] = 1;
-					$s['is_lamp'] = 0;
-					$s['is_marker'] = 0;
-				}
+				$data = array();
+				// $data = $this->Videomonitor_model->get_data_by_location($role,0,$projectid,$userid,'id,longitude,latitude,image',$filter);
+				// foreach ($data as &$s) {
+				// 	$s['image'] = base_url($s['image']);
+				// 	$s['is_video'] = 1;
+				// 	$s['is_lamp'] = 0;
+				// 	$s['is_marker'] = 0;
+				// }
 			}else{
 				$data = $this->Lamp_model->get_list_by_role($role,0,$projectid,$userid,$fields,$filter,0,1);
 			}
 		}else{
-			$videoData = $this->Videomonitor_model->get_data_by_location($role,0,$projectid,$userid,'id,longitude,latitude,image',$filter);
-			foreach ($videoData as &$s) {
-				$s['image'] = base_url($s['image']);
-				$s['is_video'] = 1;
-				$s['is_lamp'] = 0;
-				$s['is_marker'] = 0;	
-			}
-			$lampData = $this->Lamp_model->get_list_by_role($role,0,$projectid,$userid,$fields,$filter,0,1);
-			$data = array_merge($videoData,$lampData);
+			// $videoData = $this->Videomonitor_model->get_data_by_location($role,0,$projectid,$userid,'id,longitude,latitude,image',$filter);
+			// foreach ($videoData as &$s) {
+			// 	$s['image'] = base_url($s['image']);
+			// 	$s['is_video'] = 1;
+			// 	$s['is_lamp'] = 0;
+			// 	$s['is_marker'] = 0;	
+			// }
+			$data = $this->Lamp_model->get_list_by_role($role,0,$projectid,$userid,$fields,$filter,0,1);
+			// $data = array_merge($videoData,$lampData);
 		}
 		if ($multiple <= 16 && isset($lng_low) && isset($lng_high) && isset($lat_low) && isset($lat_high)) {
 			$wCount = 30;   //水平分割次数
@@ -176,7 +177,12 @@ class Map extends Base_Controller{
 				// $t['isfaulted'] = 0;
 				if(empty($t['longitude'])) $t['longitude'] = 0;
 				if(empty($t['latitude'])) $t['latitude'] = 0;
-				if(empty($t['light'])) $t['light'] = 0;
+				if(empty($t['light'])) {
+					$t['light'] = 0;
+					$t['status'] = 0;
+				}else{
+					$t['status'] = 1;
+				}
 				if (empty($t['is_video'])) {
 					$t['is_lamp'] = 1;
 					$t['is_marker'] = 0;