|
@@ -2562,7 +2562,7 @@ class CameraApiController extends BaseController
|
|
|
if (isset($matches2[1]) && isset($matches2[2])) {
|
|
|
$result['move_camera'][$i]['camera_name'] = $matches2[1];
|
|
|
$result['move_camera'][$i]['camera_id'] = $matches2[2];
|
|
|
- $result['move_camera'][$i]['parent_id'] = DB::table('camera_list')->where('id',$matches2[2])->pluck('mine_id')[0];
|
|
|
+ $result['move_camera'][$i]['parent_id'] = 6492;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -2574,11 +2574,42 @@ class CameraApiController extends BaseController
|
|
|
if (isset($matches3[1]) && isset($matches3[2])) {
|
|
|
$result['zhifa_camera'][$i]['camera_name'] = $matches3[1];
|
|
|
$result['zhifa_camera'][$i]['camera_id'] = $matches3[2];
|
|
|
- $result['zhifa_camera'][$i]['parent_id'] = DB::table('camera_list')->where('id',$matches3[2])->pluck('mine_id')[0];
|
|
|
+ $result['zhifa_camera'][$i]['parent_id'] = 6561;
|
|
|
+ $result['zhifa_camera'][$i]['color'] = 4;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $zhifa_people_list = DB::connection('mysql_fwe10')->table('uf_xx_zhifa')->where('is_delete',0)->get();
|
|
|
+
|
|
|
+ if(count($zhifa_people_list) > 0){
|
|
|
+ for($i=0;$i<count($zhifa_people_list);$i++){
|
|
|
+ $pos = strpos($risk[0]->work_people, $zhifa_people_list[$i]->xm);
|
|
|
+ if ($pos !== false) {
|
|
|
+ $camera = DB::table('camera_list')->where('camera_name',$zhifa_people_list[$i]->camera_name)->where('deleted_at',null)->get();
|
|
|
+ if(count($camera) > 0){
|
|
|
+ if($zhifa_people_list[$i]->color === null){
|
|
|
+ $zhifa_people_list[$i]->color = 4;
|
|
|
+ }
|
|
|
+
|
|
|
+ array_push($result['zhifa_camera'],[
|
|
|
+ 'camera_name'=> $zhifa_people_list[$i]->camera_name,
|
|
|
+ 'camera_id' => $camera[0]->id,
|
|
|
+ 'parent_id' => 6561,
|
|
|
+ 'color' => $zhifa_people_list[$i]->color
|
|
|
+ ]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //去掉数组重复部分
|
|
|
+ $unique_cameras = [];
|
|
|
+ foreach ($result['zhifa_camera'] as $camera) {
|
|
|
+ $unique_cameras[$camera['camera_id']] = $camera;
|
|
|
+ }
|
|
|
+ $result['zhifa_camera'] = array_values($unique_cameras);
|
|
|
+
|
|
|
if($risk[0]->risk_type != '' && $risk[0]->risk_type !=null){
|
|
|
$risk_type_value = $risk_type[$risk[0]->risk_type];
|
|
|
}else{
|