|
@@ -122,7 +122,7 @@ class ApiController extends BaseController
|
|
}else{
|
|
}else{
|
|
$color = 'red';
|
|
$color = 'red';
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
if (!$people) {
|
|
if (!$people) {
|
|
$zw = '';
|
|
$zw = '';
|
|
} else {
|
|
} else {
|
|
@@ -1199,6 +1199,27 @@ class ApiController extends BaseController
|
|
return self::successResponse($result);
|
|
return self::successResponse($result);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public function getTestList(Request $request)
|
|
|
|
+ {
|
|
|
|
+ $result['status'] = true;
|
|
|
|
+ $result['msg'] = ApiEnum::RETURN_SUCCESS;
|
|
|
|
+ $result['data'] = [];
|
|
|
|
+ $zt = $request->query('zt');
|
|
|
|
+
|
|
|
|
+ $res = DB::connection('mysql_fwe10')->table('uf_xx_dtk')
|
|
|
|
+ ->select('id','tmlx','tm','xxa','xxb','xxc','xxd','xxe')
|
|
|
|
+ ->where('is_delete',0)
|
|
|
|
+ ->where('sjzt',$zt)
|
|
|
|
+ ->orderBy('tmlx')
|
|
|
|
+ ->orderBy('create_time')->get();
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ $result['data'] = $res;
|
|
|
|
+
|
|
|
|
+ return self::successResponse($result);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
//腾讯地图逆地址解析
|
|
//腾讯地图逆地址解析
|
|
public function positionGeocoder(){
|
|
public function positionGeocoder(){
|
|
$lat = Input::get('lat', '');//纬度
|
|
$lat = Input::get('lat', '');//纬度
|
|
@@ -1367,8 +1388,8 @@ class ApiController extends BaseController
|
|
->table('uf_gggs_rygl as r1')
|
|
->table('uf_gggs_rygl as r1')
|
|
->whereIn('xm', $namesToQuery)
|
|
->whereIn('xm', $namesToQuery)
|
|
->whereRaw('CREATE_TIME = (
|
|
->whereRaw('CREATE_TIME = (
|
|
- SELECT MAX(CREATE_TIME)
|
|
|
|
- FROM uf_gggs_rygl as r2
|
|
|
|
|
|
+ SELECT MAX(CREATE_TIME)
|
|
|
|
+ FROM uf_gggs_rygl as r2
|
|
WHERE r2.xm = r1.xm)')
|
|
WHERE r2.xm = r1.xm)')
|
|
->get()
|
|
->get()
|
|
->keyBy('xm');
|
|
->keyBy('xm');
|