修改

catch/device/controller/Station.php

@@ -42,7 +42,8 @@ class Station extends CatchController
         $params=$request->post();
         $shortcode=$this->stationModel->order('shortcode','desc')->value('shortcode');
         $params['shortcode']=$shortcode+1;
-        $gcjLoc = \algorithm\Geometry::convertBd09ToGcj02((float)$params['latitude'],(float)$params['longitude']);
+        // $gcjLoc = \algorithm\Geometry::convertBd09ToGcj02((float)$params['latitude'],(float)$params['longitude']);
+        $gcjLoc = \algorithm\Geometry::wgsTOgcj((float)$params['latitude'],(float)$params['longitude']);
         $params['longitude']=$gcjLoc['lng'];
         $params['latitude']=$gcjLoc['lat'];
         return CatchResponse::success($this->stationModel->storeBy($params));
@@ -67,7 +68,8 @@ class Station extends CatchController
     public function update(Request $request, $id) : \think\Response
     {
         $params=$request->post();
-        $gcjLoc = \algorithm\Geometry::convertBd09ToGcj02((float)$params['latitude'],(float)$params['longitude']);
+        // $gcjLoc = \algorithm\Geometry::convertBd09ToGcj02((float)$params['latitude'],(float)$params['longitude']);
+        $gcjLoc = \algorithm\Geometry::wgsTOgcj((float)$params['latitude'],(float)$params['longitude']);
         $params['longitude']=$gcjLoc['lng'];
         $params['latitude']=$gcjLoc['lat'];
         return CatchResponse::success($this->stationModel->updateBy($id, $params));

catch/device/model/Device.php

@@ -72,7 +72,6 @@ class Device extends Model
         $res =  $this->dataRange()
             ->catchSearch()
             ->append(['status_icon','status_text','last_online_time'])
-
             ->order([$this->aliasField('online_time')=> 'desc','wifi_online_time'=>'desc', $this->aliasField('id') => 'desc'])
             ->paginate();
         return $res;

catch/device/model/Station.php

@@ -49,7 +49,7 @@ class Station extends Model
             ->append(['is_online','is_online_text'])
             ->order($this->aliasField('online_time'), 'desc')
             ->paginate()->each(function($item, $key)  {
-                $wgsLoc = \algorithm\Geometry::convertGcj02ToBd09((float)$item['latitude'],(float)$item['longitude']);
+                $wgsLoc = \algorithm\Geometry::gcj02ToWgs84((float)$item['latitude'],(float)$item['longitude']);
                 $item['longitude']=$wgsLoc['lng'];
                 $item['latitude']=$wgsLoc['lat'];
             });

extend/algorithm/Geometry.php

@@ -34,8 +34,8 @@ class Geometry
         $mglat = $lat + $dlat;
         $mglng = $lng + $dlng;
         return [ 
-            'lng' => $lng * 2 - $mglng, 
-            'lat' => $lat * 2 - $mglat,
+            'lng' =>round($lng * 2 - $mglng,6),
+            'lat' =>round($lat * 2 - $mglat,6), 
         ];
     }