摄像头类型修改

Modules/Admin/Http/Controllers/LoginController.php

@@ -39,7 +39,7 @@ class LoginController extends Controller
             return redirect('/admin');
         }
 
-        return view('admin::login');
+        // return view('admin::login');
     }
 
     //登录动作

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsAirAndNitrogenController.php

@@ -18,7 +18,7 @@ class ZQDcsAirAndNitrogenController  extends BaseController
     private $db_name='etl_zaoquan';
 
     protected $apiService;
-    protected $apiUrl = 'http://zdh.zaoquan.nxjiewei.com:8011/v1/common/GetPointRealDataByPageV3';
+    protected $apiUrl = 'http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3';
 
     public function __construct(ZQDcsApiService $apiService)
     {

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsFanController.php

@@ -18,7 +18,7 @@ class ZQDcsFanController  extends BaseController
 
     protected $apiService;
     protected $apiUrl = /** @lang text */
-        "http://zdh.zaoquan.nxjiewei.com:8011/v1/common/GetPointRealDataByPageV3";
+        "http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3";
 
     public function __construct(ZQDcsApiService $apiService)
     {

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsPowerController.php

@@ -18,7 +18,7 @@ class ZQDcsPowerController  extends BaseController
     private $db_name='etl_zaoquan';
 
     protected $apiService;
-    protected $apiUrl = 'http://zdh.zaoquan.nxjiewei.com:8011/v1/common/GetPointRealDataByPageV3';
+    protected $apiUrl = 'http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3';
 
     public function __construct(ZQDcsApiService $apiService)
     {

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsPumpController.php

@@ -18,7 +18,7 @@ class ZQDcsPumpController  extends BaseController
     private $db_name='etl_zaoquan';
 
     protected $apiService;
-    protected $apiUrl = 'http://zdh.zaoquan.nxjiewei.com:8011/v1/common/GetPointRealDataByPageV3';
+    protected $apiUrl = 'http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3';
 
     public function __construct(ZQDcsApiService $apiService)
     {
@@ -123,7 +123,14 @@ class ZQDcsPumpController  extends BaseController
             "2012602962545665_2", // 五分区水泵房_水泵1启停状态
             "2012602962572289_2", // 五分区水泵房_水泵2启停状态
             "2012602962603009_2", // 五分区水泵房_水泵3启停状态
-            "2012605463241729_1"  // 五分区水泵房_液位1
+            "2012605463241729_1",  // 五分区水泵房_液位1
+
+            "2044707426964481_2",
+            "2044707426978817_2",
+            "2044707426939905_2",
+            "2044707426954241_2",
+            "2044909612874753_2",
+            "2044909612889089_2"
         ];
 
         // 获取点位数据
@@ -170,33 +177,44 @@ class ZQDcsPumpController  extends BaseController
             ],
             "list"=>[
                 [
-                    "title"=>"980水泵房",
-                    "sys_code"=>"980",
+                    "title"=>"720水泵房",
+                    "sys_code"=>"720",
                     "info"=>[
                         [
                             "label"=>"1#水泵",
-                            "state"=>$baseData['2008615794158593_2'] ?? 0,
-                            "text"=>($baseData['2008615794158593_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2024441687903233_2'] ?? 0,
+                            "text"=>($baseData['2024441687903233_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
                             "label"=>"2#水泵",
-                            "state"=>$baseData['2008615794633729_2'] ?? 0,
-                            "text"=>($baseData['2008615794633729_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2024441740917761_2'] ?? 0,
+                            "text"=>($baseData['2024441740917761_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
                             "label"=>"3#水泵",
-                            "state"=>$baseData['2008615795129345_2'] ?? 0,
-                            "text"=>($baseData['2008615795129345_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2024441811375105_2'] ?? 0,
+                            "text"=>($baseData['2024441811375105_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
+                    ]
+                ],
+                [
+                    "title"=>"880水泵房",
+                    "sys_code"=>"880",
+                    "info"=>[
                         [
-                            "label"=>"4#水泵",
-                            "state"=>$baseData['2008615795635201_2'] ?? 0,
-                            "text"=>($baseData['2008615795635201_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "label"=>"1#水泵",
+                            "state"=>$baseData['2008602972865537_2'] ?? 0,
+                            "text"=>($baseData['2008602972865537_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
-                            "label"=>"5#水泵",
-                            "state"=>$baseData['2008615796143105_2'] ?? 0,
-                            "text"=>($baseData['2008615796143105_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "label"=>"2#水泵",
+                            "state"=>$baseData['2008602973135873_2'] ?? 0,
+                            "text"=>($baseData['2008602973135873_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"3#水泵",
+                            "state"=>$baseData['2008602973436929_2'] ?? 0,
+                            "text"=>($baseData['2008602973436929_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                     ]
                 ],
@@ -243,23 +261,33 @@ class ZQDcsPumpController  extends BaseController
                     ]
                 ],
                 [
-                    "title"=>"720水泵房",
-                    "sys_code"=>"720",
+                    "title"=>"980水泵房",
+                    "sys_code"=>"980",
                     "info"=>[
                         [
                             "label"=>"1#水泵",
-                            "state"=>$baseData['2024441687903233_2'] ?? 0,
-                            "text"=>($baseData['2024441687903233_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2008615794158593_2'] ?? 0,
+                            "text"=>($baseData['2008615794158593_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
                             "label"=>"2#水泵",
-                            "state"=>$baseData['2024441740917761_2'] ?? 0,
-                            "text"=>($baseData['2024441740917761_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2008615794633729_2'] ?? 0,
+                            "text"=>($baseData['2008615794633729_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
                             "label"=>"3#水泵",
-                            "state"=>$baseData['2024441811375105_2'] ?? 0,
-                            "text"=>($baseData['2024441811375105_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2008615795129345_2'] ?? 0,
+                            "text"=>($baseData['2008615795129345_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"4#水泵",
+                            "state"=>$baseData['2008615795635201_2'] ?? 0,
+                            "text"=>($baseData['2008615795635201_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"5#水泵",
+                            "state"=>$baseData['2008615796143105_2'] ?? 0,
+                            "text"=>($baseData['2008615796143105_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                     ]
                 ],
@@ -290,44 +318,65 @@ class ZQDcsPumpController  extends BaseController
                     ]
                 ],
                 [
-                    "title"=>"880水泵房",
-                    "sys_code"=>"880",
+                    "title"=>"五分区950水泵房",
+                    "sys_code"=>"5fq",
                     "info"=>[
                         [
                             "label"=>"1#水泵",
-                            "state"=>$baseData['2008602972865537_2'] ?? 0,
-                            "text"=>($baseData['2008602972865537_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2012602962545665_2'] ?? 0,
+                            "text"=>($baseData['2012602962545665_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
                             "label"=>"2#水泵",
-                            "state"=>$baseData['2008602973135873_2'] ?? 0,
-                            "text"=>($baseData['2008602973135873_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2012602962572289_2'] ?? 0,
+                            "text"=>($baseData['2012602962572289_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
                             "label"=>"3#水泵",
-                            "state"=>$baseData['2008602973436929_2'] ?? 0,
-                            "text"=>($baseData['2008602973436929_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2012602962603009_2'] ?? 0,
+                            "text"=>($baseData['2012602962603009_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                     ]
                 ],
                 [
-                    "title"=>"五分区950水泵房",
-                    "sys_code"=>"5fq",
+                    "title"=>"清水泵房",
+                    "sys_code"=>"qsb",
                     "info"=>[
                         [
                             "label"=>"1#水泵",
-                            "state"=>$baseData['2012602962545665_2'] ?? 0,
-                            "text"=>($baseData['2012602962545665_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2044707426964481_2'] ?? 0,
+                            "text"=>($baseData['2044707426964481_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
                             "label"=>"2#水泵",
-                            "state"=>$baseData['2012602962572289_2'] ?? 0,
-                            "text"=>($baseData['2012602962572289_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "state"=>$baseData['2044707426978817_2'] ?? 0,
+                            "text"=>($baseData['2044707426978817_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                         [
-                            "label"=>"3#水泵",
-                            "state"=>$baseData['2012602962603009_2'] ?? 0,
-                            "text"=>($baseData['2012602962603009_2'] ?? 0) > 0 ? "开启" : "停止"
+                            "label"=>"5#水泵",
+                            "state"=>$baseData['2044707426939905_2'] ?? 0,
+                            "text"=>($baseData['2044707426939905_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"6#水泵",
+                            "state"=>$baseData['2044707426954241_2'] ?? 0,
+                            "text"=>($baseData['2044707426954241_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                    ]
+                ],
+                [
+                    "title"=>"正1000水泵房",
+                    "sys_code"=>"p1000",
+                    "info"=>[
+                        [
+                            "label"=>"1#污水泵",
+                            "state"=>$baseData['2044909612874753_2'] ?? 0,
+                            "text"=>($baseData['2044909612874753_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"2#污水泵",
+                            "state"=>$baseData['2044909612889089_2'] ?? 0,
+                            "text"=>($baseData['2044909612889089_2'] ?? 0) > 0 ? "开启" : "停止"
                         ],
                     ]
                 ],

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsSupportController.php

@@ -18,7 +18,7 @@ class ZQDcsSupportController  extends BaseController
     private $db_name='etl_zaoquan';
 
     protected $apiService;
-    protected $apiUrl = 'http://zdh.zaoquan.nxjiewei.com:8011/v1/common/GetPointRealDataByPageV3';
+    protected $apiUrl = 'http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3';
 
     public function __construct(ZQDcsApiService $apiService)
     {

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsWorkFaceController.php

@@ -18,7 +18,7 @@ class ZQDcsWorkFaceController  extends BaseController
     private $db_name='etl_zaoquan';
 
     protected $apiService;
-    protected $apiUrl = 'http://zdh.zaoquan.nxjiewei.com:8011/v1/common/GetPointRealDataByPageV3';
+    protected $apiUrl = 'http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3';
 
     public function __construct(ZQDcsApiService $apiService)
     {

app/Http/Controllers/TestsController.php

@@ -24,6 +24,8 @@ use Modules\Mine\Entities\MineListExt;
 use Modules\Mine\Services\MineServices;
 use Modules\Mine\Enum\MineEnum;
 
+use GuzzleHttp\Client;
+
 class TestsController {
 
     public function test()
@@ -44,7 +46,7 @@ class TestsController {
 //        $this->address();
 
         //区域下摄像头接口测试
-//        $this->camera_list();
+        // $this->camera_list();
 
         //区域列表接口测试
 //        $this->mine_list();
@@ -58,7 +60,11 @@ class TestsController {
 
     //区域下摄像头接口测试
     public function camera_list(){
+<<<<<<< HEAD
         $result = CameraServices::getHaiKangCamera(968, '64018155582160000014', CameraEnum::CAMERA_TYPE_ALL);
+=======
+        $result = CameraServices::getHaiKangCamera(968, '64018112582160000010', CameraEnum::CAMERA_TYPE_ALL);
+>>>>>>> c2ff58eff46a0a950ad30de1e0770e68ef26aeec
         dd($result);
         //同步区域下摄像头
         if ($result['status']) {
@@ -276,4 +282,108 @@ class TestsController {
         $repeat_arr = array_diff_assoc ( $aa, $unique_arr );
         return $repeat_arr;
     }
+    
+    public function getDcsApiData() {
+        $apiUrl = "http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3";
+        
+        $client = new Client();
+        
+        $r = request()->all();
+        
+        if(isset($r['p'])) {
+            $p = $r['p'];
+            $k = $r['k'];
+        } else {
+            $p = $r;
+        }
+        
+        
+        $body =  [
+            'headers' => [
+                'Authorization' => 'Bearer appkey_100100',
+                'Content-Type'=>'application/json; charset=utf-8',
+                // 其他头部信息
+            ],
+            'json' =>[
+                'PageNum'=>"-1",
+                "PointIds"=>$p
+            ]
+        ];
+        // 发送 HTTP POST 请求
+        $response = $client->post($apiUrl, $body);
+        
+
+        // 获取 API 响应的 JSON 数据
+        $res = json_decode($response->getBody(), true);
+        
+        if($res['IsSuccessful'] == 0) {
+            return $res;
+        }
+
+        $data = isset($res['Data'])? $res['Data']: null;
+        
+        $transformedData['data']=[];
+        for ($i = 0; $i < count($data); $i++) {
+            $dic = $data[$i];
+            $trans['v'][] = $dic['V'];
+            $trans['list'][$i] = [
+                'id'=>$dic['ID'],
+                'nm'=>$dic['PointName'],
+                'v'=>$dic['V'],
+                ];
+            $trans['kv'][$dic['ID']] = $dic['V'];
+        }
+        
+        if (!empty($k) && isset($trans[$k])) {
+            return $trans[$k];
+        }
+        
+        return $trans;
+        
+    }
+    
+    
+
+    public function getDcsOpcData() {
+                
+        // $shell = "echo 'success' ";
+        // $shellExec = shell_exec($shell);
+        // // var_dump($shellExec);
+        // if($shellExec){echo 'ok';} else {echo 'error'}
+        
+        $pids = [
+            "ns=12380;s=九八零变电所80Z004照明回路_Ia",
+            "ns=12380;s=九八零变电所5105_IA",
+            "ns=12380;s=九八零变电所5101_UB",
+            # 添加其他节点地址...
+        ];
+        
+        $pyPath = "/home/python_proj/python_custom_script/zaoquan/dcs/";
+        $pyFName = "test1.py";
+        $pyKeyWord = "/usr/bin/python311";
+        
+        $pidsJson = json_encode($pids);
+
+        $command = "$pyKeyWord {$pyPath}{$pyFName}". ' ' . escapeshellarg("{$pidsJson}");
+        // $output = shell_exec($command);
+
+        // return shell_exec($command);
+        
+        try {
+            // 调用Python脚本
+            $output = shell_exec($command);
+            
+            // 解析Python脚本返回的JSON数据
+            $data = json_decode($output, true);
+            // $data['a'] = 'aaa';
+            // 返回JSON格式的数据给前端
+            header('Content-Type: application/json');
+            echo json_encode($data);
+        } catch (Exception $e) {
+            // 返回错误消息给前端
+            header('Content-Type: application/json');
+            echo json_encode(array("error" => $e->getMessage()));
+        }
+
+    }
 }

routes/web.php

@@ -20,3 +20,7 @@ Auth::routes();
 Route::get('/home', 'HomeController@index')->name('home');
 
 Route::any('test', ['as' => 'test', 'uses' => 'TestsController@test']);
+
+Route::any('dcsapi', ['as' => 'dcsapi', 'uses' => 'TestsController@getDcsApiData']);
+
+Route::any('dcsopc', ['as' => 'dcsopc', 'uses' => 'TestsController@getDcsOpcData']);