tongshanglei 2 years ago
parent
commit
a579d58e22
3 changed files with 42 additions and 1 deletions
  1. 6 0
      app/common.php
  2. 8 0
      catch/device/controller/Station.php
  3. 28 1
      catch/yunying/controller/Vehicle.php

+ 6 - 0
app/common.php

@@ -1513,5 +1513,11 @@ use think\facade\Cache;
         return $res;
     }
 
+    function pushDataToRedisList($data)
+    {
+        $redis=Cache::store('redis')->handler();
+        $redis->rpush('ningbo_fangdao_sync_data', json_encode($data));
+    }
+
 
 

+ 8 - 0
catch/device/controller/Station.php

@@ -46,6 +46,8 @@ class Station extends CatchController
         $gcjLoc = \algorithm\Geometry::wgsTOgcj((float)$params['latitude'],(float)$params['longitude']);
         $params['longitude']=$gcjLoc['lng'];
         $params['latitude']=$gcjLoc['lat'];
+        $params['DATA_TYPE']='station_save';
+        pushDataToRedisList($params);
         return CatchResponse::success($this->stationModel->storeBy($params));
     }
     
@@ -72,6 +74,9 @@ class Station extends CatchController
         $gcjLoc = \algorithm\Geometry::wgsTOgcj((float)$params['latitude'],(float)$params['longitude']);
         $params['longitude']=$gcjLoc['lng'];
         $params['latitude']=$gcjLoc['lat'];
+        $params['update_id']=$id;
+        $params['DATA_TYPE']='station_update';
+        pushDataToRedisList($params);
         return CatchResponse::success($this->stationModel->updateBy($id, $params));
     }
     
@@ -82,6 +87,9 @@ class Station extends CatchController
      */
     public function delete($id) : \think\Response
     {
+        $params['delete_id']=$id;
+        $params['DATA_TYPE']='station_save';
+        pushDataToRedisList($params);
         return CatchResponse::success($this->stationModel->deleteBy($id,true));
     }
 

+ 28 - 1
catch/yunying/controller/Vehicle.php

@@ -171,6 +171,8 @@ class Vehicle extends CatchController
         $param['INSTA_DATE']=date('Y-m-d H:i:s',time());
         $param['INSTALLER']=$installer;
         $r=$this->execSaveVehicle($param);
+        $param['DATA_TYPE']='vehicle_save';
+        pushDataToRedisList($param);
         return CatchResponse::success($r);
     }
     private function execSaveVehicle($data){
@@ -201,10 +203,18 @@ class Vehicle extends CatchController
     public function update(Request $request, $id) : \think\Response
     {
         $params=$request->post();
+        $conn=getOracleConnect();
+        //查老的车牌
+        $vehicle_sql='SELECT o.PLATE_NO FROM DSSC3.W_DW_NON_MOTOR o WHERE o.RFID_ID =\''.$id.'\' ';
+        $OLD_NO='';
+        $stid = oci_parse($conn, $vehicle_sql);
+        oci_define_by_name($stid, 'PLATE_NO', $OLD_NO);
+        oci_execute($stid);
+        oci_fetch($stid);
+        $params['OLD_NO']=$OLD_NO;
         $params['RFID_SN']=strtoupper($params['RFID_SN']);
         $params['PLATE_NO']=strtoupper($params['PLATE_NO']);
         // var_dump($params);
-        $conn=getOracleConnect();
         // //更新
         $sql='UPDATE DSSC3.W_DW_RFID_TAGS  SET RFID_SN = \''.$params['RFID_SN'].'\' WHERE ID = \''.$id.'\' ';
         $stid = oci_parse($conn, $sql);
@@ -237,6 +247,8 @@ class Vehicle extends CatchController
             return CatchResponse::fail('修改失败');
         }
         oci_commit($conn);
+        $params['DATA_TYPE']='vehicle_update';
+        pushDataToRedisList($params);
         return CatchResponse::success('修改成功');
 
     }
@@ -249,6 +261,17 @@ class Vehicle extends CatchController
     public function delete($id) : \think\Response
     {
         $conn=getOracleConnect();
+
+        $sql='SELECT PLATE_NO FROM DSSC3.W_DW_NON_MOTOR  WHERE RFID_ID in ('.$id.')';
+        $stid = oci_parse($conn, $sql);
+        $r = oci_execute($stid);
+        $rows=[];
+        while($row = oci_fetch_array($stid, OCI_ASSOC+OCI_RETURN_NULLS)) {
+            $rows[]=$row['PLATE_NO'];
+        }
+        $delete_data['PLATE_NO']=$rows;
+        $delete_data['DATA_TYPE']='vehicle_delete';
+
          //查车主ID
          $sql='SELECT OWNER_ID FROM DSSC3.W_DW_NON_MOTOR  WHERE RFID_ID in ('.$id.')';
          $stid = oci_parse($conn, $sql);
@@ -281,6 +304,10 @@ class Vehicle extends CatchController
             return CatchResponse::fail('删除失败');
         }
         oci_commit($conn);
+
+       
+        pushDataToRedisList($delete_data);
+       
         return CatchResponse::success(true);
     }
     /**