公告管理

Home/Lib/Action/ApiAction.class.php

@@ -721,10 +721,20 @@ class ApiAction extends Action {
 		//获取所有轨迹信号
 		$option = array();
 		$option['pagesize'] = 1000;
-		$option['asc'];
+		//$option['asc'];
+		$option['sort'] = 'asc';
 		$option['fields'] = array('Longitude','Latitude','Speed','DeviceTime');
 		$routesig = new \Rlfd\Route\RouteSignal();
-		$list = $routesig->queryEbicyleDailyGpsSignals($gpsNumber, $date,$option);
+		
+		// huang 2019.07.25
+		if (C('FDV2.GPS_JAVA_HOST')) {//GPS轨迹查询_java接口域名
+		 	$list = $routesig->queryEbicyleDailyGpsSignalsJava($gpsNumber, $date,$option);
+		} else {
+			$list = $routesig->queryEbicyleDailyGpsSignals($gpsNumber, $date,$option);
+		}
+		// huang 2019.07.25
+		
+		//$list = $routesig->queryEbicyleDailyGpsSignals($gpsNumber, $date,$option);
 		
 		//var_dump($list);
 		//var_dump(array('route'=>$list,'vehicle'=>$vehicle_info));
@@ -981,5 +991,61 @@ class ApiAction extends Action {
 		
 	}
 	
+ 
+	public  function get_article_info(  ){
+		$this->token_verify();
+		$pageSize = I('get.pagesize');
+		if(!$pageSize){
+			$pageSize = 10;
+		}
+		$page = I('get.page');
+		if(!$page){
+			$page = 0;
+		}
+		$start = $pageSize * $page;
+		$where =array('IsRelease'=>1);
+		$msg = M('jms_article')->where($where)->limit($start, $pageSize)->order('AddTime desc')->select();
+		if(!$msg){
+			$this->api_fail(C('FAIL'),'公告信息不存在');
+		}
+		$this->api_success('成功',$msg); 
+	}
+	
+ 
+	public  function get_article_detail(  ){
+		$this->token_verify();
+		//$plate = I('get.plate');
+		$id = I('get.id');
+		$msg = M('jms_article')->where(array('ID' => $id))->find();
+		if(!$msg){
+			$this->api_fail(C('FAIL'),'公告信息不存在');
+		}
+		$this->api_success('成功',$msg);
+	}
+	
+ 
+	public  function get_contact_us(  ){
+		$this->token_verify();
+		$typeid = M('jms_yy_config_type')->where(array('CityId'=>'0','TypeCode'=>'CZAPP_ContactUs'))->getField('ID');
+		$where = array('TypeId'=>$typeid,'Name'=>'联系我们','CityId'=>'0');
+		$msg = M('jms_yy_config')->where($where)->find();
+		if(!$msg){
+			$this->api_fail(C('FAIL'),'联系我们不存在');
+		}
+		$this->api_success('成功',$msg);
+	}
+	
+ 
+	public  function get_about_us(  ){
+		$this->token_verify();
+		$typeid = M('jms_yy_config_type')->where(array('CityId'=>'0','TypeCode'=>'CZAPP_AboutUs'))->getField('ID');
+		$where = array('TypeId'=>$typeid,'Name'=>'关于我们','CityId'=>'0');
+		$msg = M('jms_yy_config')->where($where)->find();
+		if(!$msg){
+			$this->api_fail(C('FAIL'),'关于我们不存在');
+		}
+		$this->api_success('成功',$msg);
+	}
+	
 
 }

Home/Lib/Action/CronAction.class.php

@@ -329,15 +329,15 @@ class CronAction extends Action {
 		
 		// fly 轨迹数据
 		$msg_data = array(
-			'StationCode' => '30B5F1012539',
+			'StationCode' => '860588041560932',
 			"Longitude" => "120.600889",
 			"Latitude" => "30.191478",
-			"Address" => "华城·和瑞科技广场(长河路475号)",
+			"Address" => "华城·和瑞科技广场".mt_rand(1,10),
 			'StationType' => 0,
 			"CityId" => "2902",
 			"StationName" => "基站名称",
 			"AddTime" => date('Y-m-d H:i:s',strtotime('-3 minutes')),
-			"VehicleNumber" => "800000241B",
+			"VehicleNumber" => "86412717AC",
 			"VehicleStatus" =>  "1",
 			"SignalCount" => 88,
 			"OnlineTime" => date('Y-m-d H:i:s',strtotime('-2 minutes'))

czapp

@@ -1 +1 @@
-Subproject commit 3fc8b5d3d34e666c71ec88a1e5be65da758bd95e
+Subproject commit 4fffcb43b83dc6361074606c08a714f86f2d62f0