围栏保存百度坐标

Home/Lib/Action/ApiAction.class.php

@@ -125,6 +125,7 @@ class ApiAction extends Action {
 		$this->token_verify();
 		$deviceNumber = $_GET['data']['deviceNumber'];
 		$licensePlate = $_GET['data']['licensePlate'];
+		$gpsNumber = $_GET['data']['gpsNumber'];
 		
 		if(!$deviceNumber){
 			$this->api_fail(C('FAIL'),'faild, no deviceNumber !');
@@ -147,9 +148,12 @@ class ApiAction extends Action {
 		//$fence = json_decode($fence, true);
 		
 		$lastLocReis = Redis('rfld_gps_last_location','hash');
-		$lastLoction = $lastLocReis->get(strtoupper($gpsNumber));
-		$lastLoction = $lastLoction = json_decode($lastLocation, true);
-		
+		$lastLoction = $lastLocReis->get($gpsNumber);
+		if($lastLoction){
+			$lastLoction = json_decode($lastLoction, true);
+			$alterVehLoction = \Jms\Algo\Geometry::convertBd09ToGcj02($lastLoction['GpsLatitude'], $lastLoction['GpsLongitude']);	
+		}
+			
 		/*
 		if(!$result){
 			$this->api_fail(C('FAIL'),'cant find this vehicle !');
@@ -170,7 +174,7 @@ class ApiAction extends Action {
 		}
 		*/
 		$mapData = array(
-			'vehicleLocation' => array('longitude' => $lastLoction['GpsLongitude'], 'latitude' => $lastLoction['GpsLatitude']),
+			'vehicleLocation' => array('longitude' => $alterVehLoction['lng'], 'latitude' => $alterVehLoction['lat']),
 		//	'vehicleAddress' => $result['Address'],
 			'lockStatus' => $vehicleInfo['LockStatus'],
 			'fenceShapeInfo' => $fence,
@@ -216,6 +220,10 @@ class ApiAction extends Action {
 		if( empty($post_data) ){
 			$this->api_fail(C('FAIL'),'post_data不能为空!');
 		}
+		$date = $post_data['StolenDate'];
+		if($date == '请选择'){
+			$this->api_fail(C('FAIL'),'请选择被盗日期');
+		}
 		$Keyword = strtoupper($post_data['LicensePlate']);
 		if ( empty($Keyword)) {
 			$this->api_fail(C('FAIL'),'报警车辆不能为空');
@@ -224,10 +232,18 @@ class ApiAction extends Action {
 		if ( empty($userid)) {
 			$this->api_fail(C('FAIL'),'用户id不能为空');
 		}
+		$stolenCityId = $post_data['StolenCityId'];
+		if ( empty($stolenCityId)) {
+			$this->api_fail(C('FAIL'),'请选择事发城市');
+		}
 		$stolenaddress = $post_data['StolenAddress'];
 		if ( empty($stolenaddress)) {
 			$this->api_fail(C('FAIL'),'事发地址不能为空');
 		}
+		$WoContent = $post_data['WoContent'];
+		if (empty($WoContent)) {
+			$this->api_fail(C('FAIL'),'报警原因不能为空');
+		}
 		//获取登录用户城市id
 		/*$cond = array('ID'=>$userid);
 		$cityid = M('uc_user')->where($cond)->getField('CityId');
@@ -250,7 +266,7 @@ class ApiAction extends Action {
 			//$chezhu_info = fd_get_userinfo($chezhu_id);
 			//$chezhu_info = get_chezhu_info($chezhu_id);*/
 		//$this->api_check_vehicle_isrepeat2($vehicle_id);
-		if (I('post.StolenDate')) {
+		if ($post_data['StolenDate'] != '请选择') {
 			$StolenDate = $post_data['StolenDate'];
 			$StolenDate = date('Y-m-d',strtotime($StolenDate));
 			// 被盗日期不能超过当前时间
@@ -264,6 +280,8 @@ class ApiAction extends Action {
 		if(M('jms_baojing')->where(array('LicensePlate' => $vehicle_info['LicensePlate'],'StolenState'=>0))->find()){
 			$this->api_fail(C('FAIL'),'报警信息已经存在');
 		}
+		$StolenCityId = explode(',',$post_data['StolenCityId']);
+		$StolenCityId = $StolenCityId[2]+1000;
 		$data = array(
 			'WoContent' => $post_data['WoContent'], 
 			'VehicleId' =>  $userid, 
@@ -275,7 +293,8 @@ class ApiAction extends Action {
 			'SubmitUserId' => $userid, 
 			'SubmitTime' => date('Y-m-d H:i:s'), 
 			'StolenDate' => $StolenDate,
-			'StolenCityId' => $vehicle_info['CityId'], //新增：被盗城市id
+			'StolenCityId' => $StolenCityId, //新增：被盗城市id
+			'StolenAddress' => $post_data['StolenAddress']
 		);
 		if (!M('jms_baojing')->createAdd($data)) {
 			$this->api_fail(C('FAIL'),'添加报警信息失败');
@@ -316,15 +335,15 @@ class ApiAction extends Action {
 		$fence_info =I('post.data');
 		$fenceData = htmlspecialchars_decode($fence_info['data']);
 		$plate = $fence_info['plate'];
-		
 		if( !$fence_info || !$plate){
 			json_fail('Missing param !');
 		}
-		var_dump($fence_info );
-		var_dump($fenceData );exit;
+		$fence_data = json_decode($fenceData, true);
+		// 保存百度地图
+		$fence_data['data']['center'] = \Jms\Algo\Geometry::convertGcj02ToBd09($fence_data['data']['center']['lat'], $fence_data['data']['center']['lng']);
 		$data = array(
 			'fenceStatus' => $fence_info['fenceAlarmEnable'] == 'true' ? true : false,
-			'fenceInfo' => $fenceData
+			'fenceInfo' => $fence_data
 		);
 		//围栏信息改为存入redis表 rlfd_vehicle_fence（ key车牌号，value围栏信息）
 		$rlfd_vehicle_fence = Redis('rlfd_vehicle_fence','hash');
@@ -528,8 +547,10 @@ class ApiAction extends Action {
 		if( !$fence ){
 			json_fail('无围栏 !');
 		}
-		
-		//$fence = json_encode($fence);
+		$fence_info = json_decode($fence, true);
+		// 转高德地图坐标
+		$fence_info['fenceInfo']['data']['center'] = \Jms\Algo\Geometry::convertBd09ToGcj02($fence_info['fenceInfo']['data']['center']['lat'], $fence_info['fenceInfo']['data']['center']['lng']);
+		$fence = json_encode($fence_info);
 		json_success('success',$fence);
 		
 	}

Home/Lib/Action/CronAction.class.php

@@ -182,13 +182,14 @@ class CronAction extends Action {
 		$rlfd_vehicle_fence = Redis('rlfd_vehicle_fence','hash');
 		$fence = $rlfd_vehicle_fence->get($plate);
 		$fence = json_decode($fence, true);
+		
 		if( empty($fence) ){
 			return '围栏信息不存在';
 		}
 		if( !$fence['fenceStatus'] ){
 			return '未启用围栏';
 		}
-		$fence_info = json_decode($fence['fenceInfo'], true);
+		$fence_info = $fence['fenceInfo'];
 		if( empty($fence_info['data']) ){
 			return '围栏坐标数据不存在';
 		}
@@ -224,7 +225,7 @@ class CronAction extends Action {
  
 	public  function mockProduce(  ){
 		$msg_data = array(
-			'DeviceId' => 110119120,
+			'DeviceId' => FFFFFF123122,
 			'State' => 1,
 			'Speed' => 1.2,
 			'Longitude' => 121.20638,

czapp

@@ -1 +1 @@
-Subproject commit 5a6ebd9d469d940e6edd84f85035bd6153597d6f
+Subproject commit d971c25d4df783ef6f905a82c2887686e1a4558e