|
@@ -1521,7 +1521,7 @@ class CameraServices
|
|
|
|
|
|
$query = MineListExt::where('mine_id', $parent_id)->first();
|
|
$query = MineListExt::where('mine_id', $parent_id)->first();
|
|
|
|
|
|
- $degree = DB::table('mine_list')->where('index_code',$mine_id)->value('degree');
|
|
|
|
|
|
+// $degree = DB::table('mine_list')->where('index_code',$mine_id)->value('degree');
|
|
|
|
|
|
$list = [];
|
|
$list = [];
|
|
|
|
|
|
@@ -1536,18 +1536,18 @@ class CameraServices
|
|
$haikang = new HaiKangController();
|
|
$haikang = new HaiKangController();
|
|
$result_hk = $haikang->getCamerasList();
|
|
$result_hk = $haikang->getCamerasList();
|
|
|
|
|
|
- $degree_list = explode('|',$degree);
|
|
|
|
|
|
+// $degree_list = explode('|',$degree);
|
|
|
|
|
|
- $result['is_update'] = false;
|
|
|
|
|
|
+// $result['is_update'] = false;
|
|
|
|
|
|
- if(count($degree_list) > 0){
|
|
|
|
- foreach($degree_list as $k => $v){
|
|
|
|
- $mine_name = DB::table('mine_list')->where('id',$v)->value('title');
|
|
|
|
- if($haikang->getMineInfo($mine_name) == true){
|
|
|
|
- $result['is_update'] = true;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+// if(count($degree_list) > 0){
|
|
|
|
+// foreach($degree_list as $k => $v){
|
|
|
|
+// $mine_name = DB::table('mine_list')->where('id',$v)->value('title');
|
|
|
|
+// if($haikang->getMineInfo($mine_name) == true){
|
|
|
|
+// $result['is_update'] = true;
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
|
|
if (isset($result_hk['data']['list'])) {
|
|
if (isset($result_hk['data']['list'])) {
|
|
foreach ($result_hk['data']['list'] as $key => $val) {
|
|
foreach ($result_hk['data']['list'] as $key => $val) {
|