Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -108,4 +108,18 @@ class ApiController extends BaseController
         $result = ApiService::getResultDetails($id);
         return self::successResponse($result);
     }
+
+    //网格化巡检记录
+    public function getFinalList()
+    {
+        $start_date = Input::get('start_date', '');
+        $end_date = Input::get('end_date', '');
+        $depart = Input::get('depart', '');
+        $person = Input::get('person', '');
+        if (!$start_date || !$end_date) {
+            return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
+        }
+        $result = ApiService::getFinalList($start_date, $end_date, $depart, $person);
+        return self::successResponse($result);
+    }
 }

Modules/Admin/Routes/api.php

@@ -38,4 +38,6 @@ Route::namespace('Api')->group(function () {
     Route::post('fanwei/get_result_dlist', 'ApiController@getResultDlist');
     //网格化巡检记录明细
     Route::post('fanwei/get_result_detail', 'ApiController@getResultDetail');
+    //网格化巡检记录
+    Route::post('fanwei/get_final_list', 'ApiController@getFinalList');
 });

Modules/Admin/Services/ApiService.php

@@ -173,7 +173,7 @@ class ApiService{
 
         if ($date_type == 'month') {
             $query = $query->where(DB::raw('MONTH(lrsj)'), DB::raw('MONTH(CURDATE())'));
-        } else if ($date_type = 'quarter') {
+        } else if ($date_type == 'quarter') {
             $query = $query->where(DB::raw('QUARTER(lrsj)'), DB::raw('QUARTER(CURDATE())'));
         } else {
             $query = $query->where(DB::raw('WEEK(lrsj)'), DB::raw('WEEK(CURDATE())'));
@@ -203,6 +203,10 @@ class ApiService{
                         ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
                         ->where('lrr', $val->lrr)->count();
 
+            if ($allcount <= 0) {
+                continue;
+            }
+
             if ($detail >= $allcount) {
                 $data[$val->lrr] = [
                     'department' => $val->dwmc,
@@ -246,7 +250,7 @@ class ApiService{
 
         if ($date_type == 'month') {
             $query = $query->where(DB::raw('MONTH(lrsj)'), DB::raw('MONTH(CURDATE())'));
-        } else if ($date_type = 'quarter') {
+        } else if ($date_type == 'quarter') {
             $query = $query->where(DB::raw('QUARTER(lrsj)'), DB::raw('QUARTER(CURDATE())'));
         } else {
             $query = $query->where(DB::raw('WEEK(lrsj)'), DB::raw('WEEK(CURDATE())'));
@@ -274,6 +278,10 @@ class ApiService{
                         ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
                         ->where('lrr', $person_id)->count();
 
+            if ($allcount <= 0) {
+                continue;
+            }
+
             if ($detail >= $allcount) {
                 $data[] = [
                     'lastname'   => $lastname,
@@ -354,4 +362,79 @@ class ApiService{
 
         return $result;
     }
+
+    //网格化巡检记录
+    public static function getFinalList($start_date, $end_date, $depart = '', $person = '')
+    {
+        $result['status'] = true;
+        $result['msg']    = ApiEnum::RETURN_SUCCESS;
+        $result['data']   = [];
+
+        $query = DB::connection('mysql_fwview')->table('uf_wghgl_new');
+
+        if ($start_date == $end_date) {
+            $query = $query->where('lrsj', 'like', $start_date . '%');
+        } else {
+            $query = $query->where('lrsj', '>=', $start_date . ' 00:00:00')->where('lrsj', '<=', $end_date . ' 23:59:59');
+        }
+
+        if ($depart) {
+            $query = $query->where('xjdw', $depart);
+        }
+
+        if ($person) {
+            $person_id = DB::connection('mysql_fwview')->table('hrmresource')
+                           ->where('lastname', 'like', '%' . $person . '%')->pluck('id')->all();
+            $query = $query->whereIn('lrr', $person_id);
+        }
+
+        $query = $query->orderBy('lrdate', 'desc')->groupBy('lrdate', 'xjdw', 'lrr')
+                       ->select(
+                           [
+                               DB::raw('DATE(lrsj) as lrdate'),
+                               'xjdw',
+                               'lrr'
+                           ]
+                       )
+                       ->get();
+
+        $data = [];
+        foreach ($query as $key => $val) {
+            $lastname = DB::connection('mysql_fwview')->table('hrmresource')
+                          ->where('id', $val->lrr)->value('lastname');
+            $allcount = DB::connection('mysql_fwview')->table('formtable_main_974')
+                          ->where('szxmc', $val->xjdw)->count();
+
+            $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
+                        ->where('xjdw', $val->xjdw)
+                        ->where(DB::raw('DATE(lrsj)'), $val->lrdate)
+                        ->where('lrr', $val->lrr)->count();
+
+            if ($allcount <= 0) {
+                continue;
+            }
+
+            if ($detail >= $allcount) {
+                $data[] = [
+                    'depart'      => $val->xjdw,
+                    'lastname'    => $lastname,
+                    'person_id'   => $val->lrr,
+                    'date'        => $val->lrdate,
+                    'is_complete' => 1
+                ];
+            } else {
+                $data[] = [
+                    'depart'      => $val->xjdw,
+                    'lastname'    => $lastname,
+                    'person_id'   => $val->lrr,
+                    'date'        => $val->lrdate,
+                    'is_complete' => 0
+                ];
+            }
+        }
+
+        $result['data'] = $data;
+
+        return $result;
+    }
 }

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

@@ -38,6 +38,8 @@ class ZQDcsAirAndNitrogenController  extends BaseController
                 return $this->get1314YfZdList(); // 1314压风制氮
             case '12':
                 return $this->get12CQList(); // 12采区压风制氮
+            case '5fq':
+                return $this->get5fqList(); // 12采区压风制氮
             default:
                 $msg="未知数据";
                 $code=-2;
@@ -1277,4 +1279,166 @@ class ZQDcsAirAndNitrogenController  extends BaseController
         return json_encode($info);
     }
 
+    /*
+     * 五分区
+     * */
+    public function get5fqList() {
+
+        $keys=[
+            "2081716011498497_2", // 五分区压风_KYJ1_RUN
+            "2081716011680769_2", // 五分区压风_KYJ2_RUN
+            "2081716011920385_2", // 五分区压风_KYJ3_RUN
+
+            "2081716013222913_1", // 五分区压风_1-1闸门.Status
+            "2081716013274113_1", // 五分区压风_1-2闸门.Status
+            "2081716013319169_1", // 五分区压风_1-3闸门.Status
+            "2081716013364225_1", // 五分区压风_1-4闸门.Status
+
+            "2081716013411329_1", // 五分区压风_2-1闸门.Status
+            "2081716013464577_1", // 五分区压风_2-2闸门.Status
+            "2081716013526017_1", // 五分区压风_2-3闸门.Status
+            "2081716013571073_1", // 五分区压风_2-4闸门.Status
+
+            "2081716013622273_1", // 五分区压风_3-1闸门.Status
+            "2081716013667329_1", // 五分区压风_3-2闸门.Status
+            "2081716013714433_1", // 五分区压风_3-3闸门.Status
+            "2081716013759489_1", // 五分区压风_3-4闸门.Status
+
+            "2081716012180481_1", // 五分区压风_KYJ1_机组排气压力
+            "2081716012911617_1", // 五分区压风_KYJ1_机组温度
+            "2081716012858369_1", // 五分区压风_KYJ1_主机温度
+
+            "2081716012254209_1", // 五分区压风_KYJ2_机组排气压力
+            "2081716013014017_1", // 五分区压风_KYJ2_机组温度
+            "2081716012960769_1", // 五分区压风_KYJ2_主机温度
+
+            "2081716012307457_1", // 五分区压风_KYJ3_机组排气压力
+            "2081716013138945_1", // 五分区压风_KYJ3_机组温度
+            "2081716013073409_1", // 五分区压风_KYJ3_主机温度
+        ];
+
+        // 获取点位数据
+        $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
+
+
+        $info = [
+            [
+                "label"=>"1#压风机",
+                "state"=> ($baseData['2081716011498497_2'] ?? 0),
+                "text"=>($baseData['2081716011498497_2'] ?? 0) > 0 ? "运行" : "停止",
+                "table"=>[
+                    "thead"=>["参数名称", "数值"],
+                    "tbody"=>[
+                        [
+                            "label"=> "排气压力",
+                            "value"=> round(($baseData['2081716012180481_1'] ?? 0) / 10, 2)."MPa",
+                        ],
+                        [
+                            "label"=> "主机温度",
+                            "value"=> round(($baseData['2081716012858369_1'] ?? 0) / 10, 2)."℃",
+                        ],
+                        [
+                            "label"=> "机组温度",
+                            "value"=> round(($baseData['2081716012911617_1'] ?? 0) / 100, 2)."℃",
+                        ],
+                        [
+                            "label"=> "1号阀",
+                            "value"=> ($baseData['2081716013222913_1'] ?? 0) == 0 ? "关" : "开",
+                        ],
+                        [
+                            "label"=> "2号阀",
+                            "value"=> ($baseData['2081716013274113_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                        [
+                            "label"=> "3号阀",
+                            "value"=> ($baseData['2081716013319169_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                        [
+                            "label"=> "4号阀",
+                            "value"=> ($baseData['2081716013364225_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                    ]
+                ]
+            ],
+            [
+                "label"=>"2#压风机",
+                "state"=> ($baseData['2081716011680769_2'] ?? 0),
+                "text"=>($baseData['2081716011680769_2'] ?? 0) > 0 ? "运行" : "停止",
+                "table"=>[
+                    "thead"=>["参数名称", "数值"],
+                    "tbody"=>[
+                        [
+                            "label"=> "排气压力",
+                            "value"=> round(($baseData['2081716012254209_1'] ?? 0) / 10, 2)."MPa",
+                        ],
+                        [
+                            "label"=> "主机温度",
+                            "value"=> round(($baseData['2081716012960769_1'] ?? 0) / 10, 2)."℃",
+                        ],
+                        [
+                            "label"=> "机组温度",
+                            "value"=> round(($baseData['2081716013014017_1'] ?? 0) / 100, 2)."℃",
+                        ],
+                        [
+                            "label"=> "1号阀",
+                            "value"=> ($baseData['2081716013411329_1'] ?? 0) == 0 ? "关" : "开",
+                        ],
+                        [
+                            "label"=> "2号阀",
+                            "value"=> ($baseData['2081716013464577_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                        [
+                            "label"=> "3号阀",
+                            "value"=> ($baseData['2081716013526017_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                        [
+                            "label"=> "4号阀",
+                            "value"=> ($baseData['2081716013571073_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                    ]
+                ]
+            ],
+            [
+                "label"=>"3#压风机",
+                "state"=> ($baseData['2081716011920385_2'] ?? 0),
+                "text"=>($baseData['2081716011920385_2'] ?? 0) > 0 ? "运行" : "停止",
+                "table"=>[
+                    "thead"=>["参数名称", "数值"],
+                    "tbody"=>[
+                        [
+                            "label"=> "排气压力",
+                            "value"=> round(($baseData['2081716012307457_1'] ?? 0) / 10, 2)."MPa",
+                        ],
+                        [
+                            "label"=> "主机温度",
+                            "value"=> round(($baseData['2081716013073409_1'] ?? 0) / 10, 2)."℃",
+                        ],
+                        [
+                            "label"=> "机组温度",
+                            "value"=> round(($baseData['2081716013138945_1'] ?? 0) / 100, 2)."℃",
+                        ],
+                        [
+                            "label"=> "1号阀",
+                            "value"=> ($baseData['2081716013622273_1'] ?? 0) == 0 ? "关" : "开",
+                        ],
+                        [
+                            "label"=> "2号阀",
+                            "value"=> ($baseData['2081716013667329_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                        [
+                            "label"=> "3号阀",
+                            "value"=> ($baseData['2081716013714433_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                        [
+                            "label"=> "4号阀",
+                            "value"=> ($baseData['2081716013759489_1'] ?? 0) == 0 ? "关" : "开"
+                        ],
+                    ]
+                ]
+            ],
+        ];
+
+        return json_encode($info);
+    }
+
 }

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

@@ -20,6 +20,12 @@ class ZQDcsFanController  extends BaseController
     protected $apiUrl = /** @lang text */
         "http://7.250.4.3:4300/v1/common/GetPointRealDataByPageV3";
 
+    private $xuan = ["对旋1","对旋2","对旋2"];
+    private $kong = ["近控","遥控","远控"];
+    private $guzhang = ["无故障","前级故障","后级故障"];
+    private $open = ["打开","关闭"];
+
+
     public function __construct(ZQDcsApiService $apiService)
     {
         parent::__construct();
@@ -60,6 +66,8 @@ class ZQDcsFanController  extends BaseController
                     return $this->get250602hfxList();
                 case "13207jx": // 13207机巷
                     return $this->get13207jxList();
+                case "1295hfx": // 1295回风巷
+                    return $this->get1295hfxList();
                 case "index": //
                     return $this->getInfoList();
                 default:
@@ -380,22 +388,22 @@ class ZQDcsFanController  extends BaseController
                         ]
                     ]
                 ],
-//                [
-//                    "title"=>"110207回风巷",
-//                    "sys_code"=>"110207hfx",
-//                    "info"=>[
-//                        [
-//                            "label"=>"1#风机",
-//                            "state"=>$baseData["2074957336810497_2"] + $baseData["2074957337701377_2"] > 0 ? 1 : 0,
-//                            "text"=>"停止"
-//                        ],
-//                        [
-//                            "label"=>"2#风机",
-//                            "state"=>$baseData["2074957340046337_2"] + $baseData["2074957341252609_2"] > 0 ? 1 : 0,
-//                            "text"=>"运行"
-//                        ]
-//                    ]
-//                ],
+                [
+                    "title"=>"110207回风巷",
+                    "sys_code"=>"110207hfx",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData["2074957336810497_2"] + $baseData["2074957337701377_2"] > 0 ? 1 : 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData["2074957340046337_2"] + $baseData["2074957341252609_2"] > 0 ? 1 : 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
                 [
                     "title"=>"110207机巷通风机",
                     "sys_code"=>"110207jx",
@@ -449,6 +457,7 @@ class ZQDcsFanController  extends BaseController
 
         return json_encode($info);
     }
+
     /*
      * 13207机巷
      */
@@ -676,6 +685,284 @@ class ZQDcsFanController  extends BaseController
     }
 
     /*
+     * 1295回风巷
+     */
+    public function get1295hfxList() {
+
+        $keys = [
+            "2104728871521281_1",  // "1295回风巷通风机_主机前级状态"
+            "2104728871715841_1",  // "1295回风巷通风机_主机后级状态"
+            "2104728875791361_1",  // "1295回风巷通风机_副机前级状态"
+            "2104728876463105_1",  // "1295回风巷通风机_副机后级状态"
+
+            "2104728877978625_1",  // "1295回风巷通风机_风速"
+
+            "2104728872152065_1",  // "1295回风巷通风机_主机系统电压"
+
+            "2104728877591553_1",  // "1295回风巷通风机_副机系统电压"
+
+
+            "2104728871367681_1",  // "1295回风巷通风机_主机前级A相电流"
+            "2104728871414785_1",  // "1295回风巷通风机_主机前级B相电流"
+            "2104728871463937_1",  // "1295回风巷通风机_主机前级C相电流"
+
+            "2104728871568385_1",  // "1295回风巷通风机_主机后级A相电流"
+            "2104728871619585_1",  // "1295回风巷通风机_主机后级B相电流"
+            "2104728871668737_1",  // "1295回风巷通风机_主机后级C相电流"
+
+            "2104728874243073_1",  // "1295回风巷通风机_副机前级A相电流"
+            "2104728874750977_1",  // "1295回风巷通风机_副机前级B相电流"
+            "2104728875435009_1",  // "1295回风巷通风机_副机前级C相电流"
+
+            "2104728876125185_1",  // "1295回风巷通风机_副机后级A相电流"
+            "2104728876305409_1",  // "1295回风巷通风机_副机后级B相电流"
+            "2104728876383233_1",  // "1295回风巷通风机_副机后级C相电流"
+
+            "2104728872752129_1",  // "1295回风巷通风机_主机额定电流"
+            "2104728877810689_1",  // "1295回风巷通风机_副机额定电流"
+
+            "2104728872494081_1",  // "1295回风巷通风机_主机额定电压"
+            "2104728877757441_1",  // "1295回风巷通风机_副机额定电压"
+
+
+            "2104728872051713_1",  // "1295回风巷通风机_主机欠压系数"
+            "2104728876811265_1",  // "1295回风巷通风机_副机欠压系数"
+
+            "2104728871926785_1",  // "1295回风巷通风机_主机欠压时间"
+            "2104728876639233_1",  // "1295回风巷通风机_副机欠压时间"
+
+            "2104728872313857_1",  // "1295回风巷通风机_主机过压系数"
+            "2104728877706241_1",  // "1295回风巷通风机_副机过压系数"
+
+            "2104728872215553_1",  // "1295回风巷通风机_主机过压时间"
+            "2104728877655041_1",  // "1295回风巷通风机_副机过压时间"
+
+            "2104728871316481_1",  // "1295回风巷通风机_主机不平衡系数"
+            "2104728873632769_1",  // "1295回风巷通风机_副机不平衡系数"
+
+            "2104728871220225_1",  // "1295回风巷通风机_主机不平衡保护时间"
+            "2104728873106433_1",  // "1295回风巷通风机_副机不平衡保护时间"
+
+            "2104728871764993_1",  // "1295回风巷通风机_主机启动器类型"
+            "2104728876522497_1",  // "1295回风巷通风机_副机启动器类型"
+
+            "2104728871879681_1",  // "1295回风巷通风机_主机工作模式"
+            "2104728876581889_1",  // "1295回风巷通风机_副机工作模式"
+
+            "2104728867851265_2",  // "1295回风巷通风机_主机前级合闸"
+            "2104728869229569_2",  // "1295回风巷通风机_副机前级合闸"
+
+            "2104728868600833_2",  // "1295回风巷通风机_主机后级合闸"
+            "2104728869612545_2",  // "1295回风巷通风机_副机后级合闸"
+
+            "2104891492305921_2",  // "1295回风巷通风机_主机短路功能"
+            "2104891492623361_2",  // "1295回风巷通风机_副机短路功能"
+
+            "2104891492588545_2",  // "1295回风巷通风机_主机欠压功能"
+            "2104891492832257_2",  // "1295回风巷通风机_副机欠压功能"
+
+            "2104891492684801_2",  // "1295回风巷通风机_主机过载功能"
+            "2104891493096449_2",  // "1295回风巷通风机_副机过载功能"
+
+            "2104891492656129_2",  // "1295回风巷通风机_主机过压功能"
+            "2104891492948993_2",  // "1295回风巷通风机_副机过压功能"
+
+            "2104893388291073_2",  // "1295回风巷通风机_主机不平衡功能"
+            "2104891492744193_2",  // "1295回风巷通风机_副机不平衡功能"
+
+            "2104728877927425_1",  // "1295回风巷通风机_电池芯总电压"
+
+            "2104728870532097_2",  // "1295回风巷通风机_电池充电使能"
+            "2104728871001089_2",  // "1295回风巷通风机_电池放电使能"
+
+            "2104728870579201_2",  // "1295回风巷通风机_电池充电状态"
+            "2104728871033857_2",  // "1295回风巷通风机_电池放电状态"
+
+            "2104728877861889_1",  // "1295回风巷通风机_电池剩余电量"
+
+        ];
+
+        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
+
+        if($dataFromGetRequest["data"] == 0) {
+            $msg = $dataFromGetRequest["Message"];
+            return $this->error(-1, $msg);
+        }
+
+        $baseData = $dataFromGetRequest["data"];
+
+
+        $data["tab"]=[
+            [
+                "title"=>"主风机",
+                "state"=>$baseData["2104728871521281_1"] + $baseData["2104728871715841_1"] >= 1 ? 1 : 0,
+                "list"=>[
+                ]
+            ],
+            [
+                "title"=>"副风机",
+                "state"=>$baseData["2104728875791361_1"] + $baseData["2104728876463105_1"] >= 1 ? 1 : 0,
+                "list"=>[
+                ]
+            ]
+        ];
+
+        $data["table_1"]=[
+            "thead"=>[
+                "参数名称", "主风机", "副风机"
+            ],
+            "tbody"=>[
+                [
+                    "label"=>"Ia1电流（A）",
+                    "value_1"=>$baseData["2104728871367681_1"] ?? 0,
+                    "value_2"=>$baseData["2104728874243073_1"] ?? 0,
+                ],
+                [
+                    "label"=>"Ib1电流（A）",
+                    "value_1"=>$baseData["2104728871414785_1"] ?? 0,
+                    "value_2"=>$baseData["2104728874750977_1"] ?? 0,
+                ],
+                [
+                    "label"=>"Ic1电流（A）",
+                    "value_1"=>$baseData["2104728871463937_1"] ?? 0,
+                    "value_2"=>$baseData["2104728875435009_1"] ?? 0,
+                ],
+                [
+                    "label"=>"Ia2电流（A）",
+                    "value_1"=>$baseData["2104728871568385_1"] ?? 0,
+                    "value_2"=>$baseData["2104728876125185_1"] ?? 0,
+                ],
+                [
+                    "label"=>"Ib2电流（A）",
+                    "value_1"=>$baseData["2104728871619585_1"] ?? 0,
+                    "value_2"=>$baseData["2104728876305409_1"] ?? 0,
+                ],
+                [
+                    "label"=>"Ic2电流（A）",
+                    "value_1"=>$baseData["2104728871668737_1"] ?? 0,
+                    "value_2"=>$baseData["2104728876383233_1"] ?? 0,
+                ],
+                [
+                    "label"=>"额定电流（A）",
+                    "value_1"=>$baseData["2104728872752129_1"] ?? 0,
+                    "value_2"=>$baseData["2104728877810689_1"] ?? 0,
+                ],
+                [
+                    "label"=>"额定电压（V）",
+                    "value_1"=>$baseData["2104728872494081_1"] ?? 0,
+                    "value_2"=>$baseData["2104728877757441_1"] ?? 0,
+                ],
+                [
+                    "label"=>"欠压倍数（%）",
+                    "value_1"=>$baseData["2104728872051713_1"] ?? 0,
+                    "value_2"=>$baseData["2104728876811265_1"] ?? 0,
+                ],
+                [
+                    "label"=>"欠压时间（s）",
+                    "value_1"=>$baseData["2104728871926785_1"] ?? 0,
+                    "value_2"=>$baseData["2104728876639233_1"] ?? 0,
+                ],
+                [
+                    "label"=>"过压倍数（%）",
+                    "value_1"=>$baseData["2104728872313857_1"] ?? 0,
+                    "value_2"=>$baseData["2104728877706241_1"] ?? 0,
+                ],
+                [
+                    "label"=>"过压时间（s）",
+                    "value_1"=>$baseData["2104728872215553_1"] ?? 0,
+                    "value_2"=>$baseData["2104728877655041_1"] ?? 0,
+                ],
+                [
+                    "label"=>"不平衡倍数（%）",
+                    "value_1"=>$baseData["2104728871316481_1"] ?? 0,
+                    "value_2"=>$baseData["2104728873632769_1"] ?? 0,
+                ],
+                [
+                    "label"=>"不平衡保护时间（s）",
+                    "value_1"=>$baseData["2104728871220225_1"] ?? 0,
+                    "value_2"=>$baseData["2104728873106433_1"] ?? 0,
+                ],
+                [
+                    "label"=>"启动器类型",
+                    "value_1"=>($baseData["2104728871764993_1"] ?? 0) == 0 ? "主机" : "备机",
+                    "value_2"=>($baseData["2104728876522497_1"] ?? 0) == 0 ? "主机" : "备机",
+                ],
+                [
+                    "label"=>"工作方式",
+                    "value_1"=>($baseData["2104728871879681_1"] ?? 0) == 0 ? "" : "主机对等",
+                    "value_2"=>($baseData["2104728876581889_1"] ?? 0) == 0 ? "" : "主机对等",
+                ],
+                [
+                    "label"=>"前级状态",
+                    "value_1"=>($baseData["2104728867851265_2"] ?? 0) == 0 ? "分闸" : "合闸",
+                    "value_2"=>($baseData["2104728869229569_2"] ?? 0) == 0 ? "分闸" : "合闸",
+                ],
+                [
+                    "label"=>"后级状态",
+                    "value_1"=>($baseData["2104728868600833_2"] ?? 0) == 0 ? "分闸" : "合闸",
+                    "value_2"=>($baseData["2104728869612545_2"] ?? 0) == 0 ? "分闸" : "合闸",
+                ],
+                [
+                    "label"=>"短路功能",
+                    "value_1"=>($baseData["2104891492305921_2"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104891492623361_2"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+                [
+                    "label"=>"欠压功能",
+                    "value_1"=>($baseData["2104891492588545_2"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104891492832257_2"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+                [
+                    "label"=>"过载功能",
+                    "value_1"=>($baseData["2104891492684801_2"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104891493096449_2"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+                [
+                    "label"=>"过压功能",
+                    "value_1"=>($baseData["2104891492656129_2"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104891492948993_2"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+                [
+                    "label"=>"不平衡功能",
+                    "value_1"=>($baseData["2104893388291073_2"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104891492744193_2"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+                [
+                    "label"=>"电池总压",
+                    "value_1"=>$baseData["2104728877927425_1"] ?? 0,
+                    "value_2"=>$baseData["2104728877927425_1"] ?? 0,
+                ],
+                [
+                    "label"=>"进电状态",
+                    "value_1"=>($baseData["2104728870532097_2"] ?? 0) == 0 ? "无进电" : "有进电",
+                    "value_2"=>($baseData["2104728870532097_2"] ?? 0) == 0 ? "无进电" : "有进电",
+                ],
+                [
+                    "label"=>"出电状态",
+                    "value_1"=>($baseData["2104728871001089_2"] ?? 0) == 0 ? "无出电" : "无出电",
+                    "value_2"=>($baseData["2104728871001089_2"] ?? 0) == 0 ? "无出电" : "无出电",
+                ],
+                [
+                    "label"=>"充电状态",
+                    "value_1"=>($baseData["2104728870579201_2"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104728870579201_2"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+                [
+                    "label"=>"放电状态",
+                    "value_1"=>($baseData["2104728870579201_2"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104728870579201_2"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+                [
+                    "label"=>"电池电量",
+                    "value_1"=>($baseData["2104728877861889_1"] ?? 0) == 0 ? "关闭" : "打开",
+                    "value_2"=>($baseData["2104728877861889_1"] ?? 0) == 0 ? "关闭" : "打开",
+                ],
+            ]
+        ];
+        return json_encode($data);
+    }
+
+    /*
      * 250602回风巷
      */
     public function get250602hfxList() {
@@ -2244,22 +2531,25 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = ["",""];
-        if ($baseData["2049479115654145_2"] == 1) {
-            $workMode[0] = "对旋1";
-        } else if ($baseData["2049479115678721_2"] == 1) {
-            $workMode[0] = "对旋2";
-        } else if ($baseData["2049479115709441_2"] == 1) {
-            $workMode[0] = "对旋3";
-        }
+//        $workMode = ["",""];
+//        if ($baseData["2049479115654145_2"] == 1) {
+//            $workMode[0] = "对旋1";
+//        } else if ($baseData["2049479115678721_2"] == 1) {
+//            $workMode[0] = "对旋2";
+//        } else if ($baseData["2049479115709441_2"] == 1) {
+//            $workMode[0] = "对旋3";
+//        }
+//        if ($baseData["2049479118173185_2"] == 1) {
+//            $workMode[1] = "对旋1";
+//        } else if ($baseData["2049479118201857_2"] == 1) {
+//            $workMode[1] = "对旋2";
+//        } else if ($baseData["2049479118257153_2"] == 1) {
+//            $workMode[1] = "对旋3";
+//        }
+
+        $workMode[0] = $this->getXuanState([$baseData["2049479115654145_2"],$baseData["2049479115678721_2"],$baseData["2049479115709441_2"]]);
+        $workMode[1] = $this->getXuanState([$baseData["2049479118173185_2"],$baseData["2049479118201857_2"],$baseData["2049479118257153_2"]]);
 
-        if ($baseData["2049479118173185_2"] == 1) {
-            $workMode[1] = "对旋1";
-        } else if ($baseData["2049479118201857_2"] == 1) {
-            $workMode[1] = "对旋2";
-        } else if ($baseData["2049479118257153_2"] == 1) {
-            $workMode[1] = "对旋3";
-        }
 
         $ctrlMode = ["",""];
         if ($baseData["2049479116092417_2"] == 1) {
@@ -3719,4 +4009,17 @@ class ZQDcsFanController  extends BaseController
         }
     }
 
+    private function getXuanState($data = []) {
+        if (empty($data)) {
+            return false;
+        }
+        for ($i = 0; $i < count($data); $i++) {
+            $state = $data[$i];
+            if ($state == 1) {
+                return $this->xuan[$i];
+            }
+        }
+        return $this->xuan[0];
+    }
+
 }

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

@@ -8,6 +8,7 @@ use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\Request;
 use Modules\OpcData\Services\zaoquan\ZQDcsApiService;
+use Modules\OpcData\Services\zaoquan\ZQDcsOpcService;
 
 /**
  * 枣泉自动化——电力
@@ -54,6 +55,10 @@ class ZQDcsPowerController  extends BaseController
                     return $this->get5fq950List();
                 case '5fq1200': // 五分区1200
                     return $this->get5fq1200List();
+                case 'd929': // 井下929
+                    return $this->getd929List();
+                case 'd950': // 井下950
+                    return $this->getd950List();
                 default:
                     $msg="未知数据";
                     $code=-2;
@@ -5097,4 +5102,753 @@ class ZQDcsPowerController  extends BaseController
         return json_encode($info);
     }
 
+    /*
+     * 井下929
+     * */
+    public function getd929List() {
+
+        $keys=[
+            "2046459469167617_2", // 929变电所_5201_开关
+            "2046459469741057_2", // 929变电所_5202_开关
+            "2046459470359553_2", // 929变电所_5203_开关
+            "2046459470935041_2", // 929变电所_5204_开关
+            "2046459471543297_2", // 929变电所_5001_开关
+            "2046459474347009_2", // 929变电所_5205_开关
+            "2046459472092161_2", // 929变电所_5104_开关
+            "2046459472669697_2", // 929变电所_5103_开关
+            "2046459473208321_2", // 929变电所_5102_29102_开关
+            "2046459473783809_2", // 929变电所_5101_开关
+            "2047051390798849_2", // 929_29F102
+            "2046459475362817_2", // 929变电所_29F101_开关合位
+            "2046459475184641_2", // 929变电所_29F100_开关合位
+            "2046459477984257_2", // 929变电所_1号风机变低压_开关
+            "2046459477730305_2", // 929变电所_1号风机变高压_开关
+            "2046459478744065_2", // 929变电所_2号动力变高压_开关
+            "2046459478983681_2", // 929变电所_2号动力变低压_开关
+
+            "2046459475739649_2", // 929变电所_29D201_开关合位
+            "2047198357621761_2", // 929_1#动力变高压
+            "2047198357560321_2", // 929_1#动力变低压
+            "2047210845848577_2", // 929_29D100
+            "2046459474828289_2", // 929变电所_29D101_开关合位
+            "2046459477425153_2", // 929_29Z104
+            "2069539272504321_2", // 929_29Z103
+            "2046459476429825_2", // 929变电所_29DZ102_开关合位
+            "2046459476089857_2", // 929变电所_29DZ101_开关合位
+
+
+            "2046501453607937_1", // 929变电所5201_Q
+            "2046501453569025_1", // 929变电所5201_P
+            "2046501453530113_1", // 929变电所5201_UB
+            "2046501453650945_1", // 929变电所5201_COS
+            "2046501453419521_1", // 929变电所5201_IA
+
+            "2046501453847553_1", // 929变电所5202_Q
+            "2046501453808641_1", // 929变电所5202_P
+            "2046501453771777_1", // 929变电所5202_UB
+            "2046501453886465_1", // 929变电所5202_COS
+            "2046501453689857_1", // 929变电所5202_IA
+
+            "2046501454085121_1", // 929变电所5203_Q
+            "2046501454048257_1", // 929变电所5203_P
+            "2046501454009345_1", // 929变电所5203_UB
+            "2046501454158849_1", // 929变电所5203_COS
+            "2046501453923329_1", // 929变电所5203_IA
+
+            "2046501454357505_1", // 929变电所5204_Q
+            "2046501454318593_1", // 929变电所5204_P
+            "2046501454279681_1", // 929变电所5204_UB
+            "2046501454394369_1", // 929变电所5204_COS
+            "2046501454197761_1", // 929变电所5204_IA
+
+            "2046501454574593_1", // 929变电所5001_Q
+            "2046501454535681_1", // 929变电所5001_P
+            "2046501454498817_1", // 929变电所5001_UB
+            "2046501454621697_1", // 929变电所5001_COS
+            "2046501454429185_1", // 929变电所5001_IA
+
+            "2046501455725569_1", // 929变电所5205_Q
+            "2046501455686657_1", // 929变电所5205_P
+            "2046501455651841_1", // 929变电所5205_UB
+            "2046501455760385_1", // 929变电所5205_COS
+            "2046501455576065_1", // 929变电所5205_IA
+
+            "2046501454834689_1", // 929变电所5104_Q
+            "2046501454799873_1", // 929变电所5104_P
+            "2046501454760961_1", // 929变电所5104_UB
+            "2046501454871553_1", // 929变电所5104_COS
+            "2046501454666753_1", // 929变电所5104_IA
+
+            "2046501455055873_1", // 929变电所5103_Q
+            "2046501455021057_1", // 929变电所5103_P
+            "2046501454984193_1", // 929变电所5103_UB
+            "2046501455092737_1", // 929变电所5103_COS
+            "2046501454906369_1", // 929变电所5103_IA
+
+            "2046501455279105_1", // 929变电所5102_29102_Q
+            "2046501455240193_1", // 929变电所5102_29102_P
+            "2046501455203329_1", // 929变电所5102_29102_UB
+            "2046501455315969_1", // 929变电所5102_29102_COS
+            "2046501455129601_1", // 929变电所5102_29102_IA
+
+            "2046501455498241_1", // 929变电所5101_Q
+            "2046501455465473_1", // 929变电所5101_P
+            "2046501455428609_1", // 929变电所5101_UB
+            "2046501455537153_1", // 929变电所5101_COS
+            "2046501455350785_1", // 929变电所5101_IA
+
+
+            "2046501457140737_1", // 929变电所29F101_UAB
+            "2046501456827393_1", // 929变电所29F101_IA
+
+            "2046501456790529_1", // 929变电所29F100_UAB
+            "2046501456485377_1", // 929变电所29F100_IA
+
+            "2046501458723841_1", // 929变电所1_风机变低压电压
+            "2046501458762753_1", // 929变电所1_风机变低压电流
+
+            "2046501458607105_1", // 929变电所1_风机变高压电压
+            "2046501458643969_1", // 929变电所1_风机变高压电流
+
+            "2046501459072001_1", // 929变电所2_动力变高压电压
+            "2046501459108865_1", // 929变电所2_动力变高压电流
+
+
+            "2046501459184641_1", // 929变电所2_动力变低压电压
+            "2046501459223553_1", // 929变电所2_动力变低压电流
+
+            "2046501457800193_1", // 929变电所29D201_UAB
+            "2046501457505281_1", // 929变电所29D201_IA
+
+            "2046501458840577_1", // 929变电所1_动力变高压电压
+            "2046501458879489_1", // 929变电所1_动力变高压电流
+
+            "2046501458959361_1", // 929变电所1_动力变低压电压
+            "2046501458996225_1", // 929变电所1_动力变低压电流
+
+            "2069518548093953_1", // 929变电所29D100_Ia
+            "2069524603988993_1", // 929变电所29D100_Uc
+
+            "2046501455834113_1", // 929变电所29D101_IC
+            "2046501455954945_1", // 929变电所29D101_US
+
+            "2046501458457601_1", // 929变电所29DZ201_UCA z104
+            "2046501458533377_1", // 929变电所29DZ201_IB
+
+            "2069524914854913_1", // 929变电所29Z103照明_Uca
+            "2069525340591105_1", // 929变电所29Z103照明_Ic
+
+            "2069525769933825_1", // 929变电所29Z102信息化电源_Uca
+            "2069527254408193_1", // 929变电所29Z102信息化电源_Ib
+
+            "2069527816537089_1", // 929变电所29Z1014G电源_Uca
+            "2069528080405505_1", // 929变电所29Z1014G电源_Ib
+
+        ];
+
+        // 获取点位数据
+        $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
+
+
+        $info = [
+            "tip"=>[
+                [
+                    "color"=>"#00FF00",
+                    "text"=>"关"
+                ],
+                [
+                    "color"=>"#FF0000",
+                    "text"=>"开"
+                ],
+            ],
+            "state"=>[
+                ($baseData["2046459469167617_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5201_开关
+                ($baseData["2046459469741057_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5202_开关
+                ($baseData["2046459470359553_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5203_开关
+                ($baseData["2046459470935041_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5204_开关
+                ($baseData["2046459471543297_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5001_开关
+                ($baseData["2046459474347009_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5205_开关
+                ($baseData["2046459472092161_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5104_开关
+                ($baseData["2046459472669697_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5103_开关
+                ($baseData["2046459473208321_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5102_29102_开关
+                ($baseData["2046459473783809_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5101_开关
+                ($baseData["2047051390798849_2"] ?? 0) <= 0 ? 0 : 1, // 929_29F102
+                ($baseData["2046459475362817_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29F101_开关合位
+                ($baseData["2046459475184641_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29F100_开关合位
+                ($baseData["2046459477984257_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_1号风机变低压_开关
+                ($baseData["2046459477730305_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_1号风机变高压_开关
+                ($baseData["2046459478744065_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_2号动力变高压_开关
+                ($baseData["2046459478983681_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_2号动力变低压_开关
+                0, // 29D200
+                ($baseData["2046459475739649_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29D201_开关合位
+                ($baseData["2047198357621761_2"] ?? 0) <= 0 ? 0 : 1, // 929_1#动力变高压
+                ($baseData["2047198357560321_2"] ?? 0) <= 0 ? 0 : 1, // 929_1#动力变低压
+                ($baseData["2047210845848577_2"] ?? 0) <= 0 ? 0 : 1, // 929_29D100
+                ($baseData["2046459474828289_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29D101_开关合位
+                ($baseData["2046459477425153_2"] ?? 0) <= 0 ? 0 : 1, // 929_29Z104
+                ($baseData["2069539272504321_2"] ?? 0) <= 0 ? 0 : 1, // 929_29Z103
+                ($baseData["2046459476429825_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29DZ102_开关合位
+                ($baseData["2046459476089857_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29DZ101_开关合位
+            ],
+            "table_data"=>[
+                [
+                    "title"=>"井下+929m变电所1",
+                    "table"=>[
+                        "thead"=>["名称", "Q:kVar", "p:kw", "Uab:V", "Cos", "Ia:A"],
+                        "tbody"=>[
+                            [
+                                "5201",
+                                $baseData["2046501453607937_1"] ?? 0, // 929变电所5201_Q
+                                $baseData["2046501453569025_1"] ?? 0, // 929变电所5201_P
+                                $baseData["2046501453530113_1"] ?? 0, // 929变电所5201_UB
+                                $baseData["2046501453650945_1"] ?? 0, // 929变电所5201_COS
+                                $baseData["2046501453419521_1"] ?? 0, // 929变电所5201_IA
+                            ],
+                            [
+                                "5202",
+                                $baseData["2046501453847553_1"] ?? 0, // 929变电所5202_Q
+                                $baseData["2046501453808641_1"] ?? 0, // 929变电所5202_P
+                                $baseData["2046501453771777_1"] ?? 0, // 929变电所5202_UB
+                                $baseData["2046501453886465_1"] ?? 0, // 929变电所5202_COS
+                                $baseData["2046501453689857_1"] ?? 0, // 929变电所5202_IA
+                            ],
+                            [
+                                "5203",
+                                $baseData["2046501454085121_1"] ?? 0, // 929变电所5203_Q
+                                $baseData["2046501454048257_1"] ?? 0, // 929变电所5203_P
+                                $baseData["2046501454009345_1"] ?? 0, // 929变电所5203_UB
+                                $baseData["2046501454158849_1"] ?? 0, // 929变电所5203_COS
+                                $baseData["2046501453923329_1"] ?? 0, // 929变电所5203_IA
+                            ],
+                            [
+                                "5204",
+                                $baseData["2046501454357505_1"] ?? 0, // 929变电所5204_Q
+                                $baseData["2046501454318593_1"] ?? 0, // 929变电所5204_P
+                                $baseData["2046501454279681_1"] ?? 0, // 929变电所5204_UB
+                                $baseData["2046501454394369_1"] ?? 0, // 929变电所5204_COS
+                                $baseData["2046501454197761_1"] ?? 0, // 929变电所5204_IA
+                            ],
+                            [
+                                "5001",
+                                $baseData["2046501454574593_1"] ?? 0, // 929变电所5001_Q
+                                $baseData["2046501454535681_1"] ?? 0, // 929变电所5001_P
+                                $baseData["2046501454498817_1"] ?? 0, // 929变电所5001_UB
+                                $baseData["2046501454621697_1"] ?? 0, // 929变电所5001_COS
+                                $baseData["2046501454429185_1"] ?? 0, // 929变电所5001_IA
+                            ],
+                            [
+                                "5205",
+                                $baseData["2046501455725569_1"] ?? 0, // 929变电所5205_Q
+                                $baseData["2046501455686657_1"] ?? 0, // 929变电所5205_P
+                                $baseData["2046501455651841_1"] ?? 0, // 929变电所5205_UB
+                                $baseData["2046501455760385_1"] ?? 0, // 929变电所5205_COS
+                                $baseData["2046501455576065_1"] ?? 0, // 929变电所5205_IA
+                            ],
+                            [
+                                "5104",
+                                $baseData["2046501454834689_1"] ?? 0, // 929变电所5104_Q
+                                $baseData["2046501454799873_1"] ?? 0, // 929变电所5104_P
+                                $baseData["2046501454760961_1"] ?? 0, // 929变电所5104_UB
+                                $baseData["2046501454871553_1"] ?? 0, // 929变电所5104_COS
+                                $baseData["2046501454666753_1"] ?? 0, // 929变电所5104_IA
+                            ],
+                            [
+                                "5103",
+                                $baseData["2046501455055873_1"] ?? 0, // 929变电所5103_Q
+                                $baseData["2046501455021057_1"] ?? 0, // 929变电所5103_P
+                                $baseData["2046501454984193_1"] ?? 0, // 929变电所5103_UB
+                                $baseData["2046501455092737_1"] ?? 0, // 929变电所5103_COS
+                                $baseData["2046501454906369_1"] ?? 0, // 929变电所5103_IA
+                            ],
+                            [
+                                "29G102",
+                                $baseData["2046501455279105_1"] ?? 0, // 929变电所5102_29102_Q
+                                $baseData["2046501455240193_1"] ?? 0, // 929变电所5102_29102_P
+                                $baseData["2046501455203329_1"] ?? 0, // 929变电所5102_29102_UB
+                                $baseData["2046501455315969_1"] ?? 0, // 929变电所5102_29102_COS
+                                $baseData["2046501455129601_1"] ?? 0, // 929变电所5102_29102_IA
+                            ],
+                            [
+                                "5101",
+                                $baseData["2046501455498241_1"] ?? 0, // 929变电所5101_Q
+                                $baseData["2046501455465473_1"] ?? 0, // 929变电所5101_P
+                                $baseData["2046501455428609_1"] ?? 0, // 929变电所5101_UB
+                                $baseData["2046501455537153_1"] ?? 0, // 929变电所5101_COS
+                                $baseData["2046501455350785_1"] ?? 0, // 929变电所5101_IA
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"井下+929m变电所2",
+                    "table"=>[
+                        "thead"=>["名称", "Uab:V", "Ia:A"],
+                        "tbody"=>[
+                            [
+                                "29F102",
+                                "0", "0"
+                            ],
+                            [
+                                "29F101",
+                                $baseData["2046501457140737_1"] ?? 0, // 929变电所29F101_UAB
+                                $baseData["2046501456827393_1"] ?? 0, // 929变电所29F101_IA
+                            ],
+                            [
+                                "29F100",
+                                $baseData["2046501456790529_1"] ?? 0, // 929变电所29F100_UAB
+                                $baseData["2046501456485377_1"] ?? 0, // 929变电所29F100_IA
+                            ],
+                            [
+                                "1#风机变低压",
+                                $baseData["2046501458723841_1"] ?? 0, // 929变电所1_风机变低压电压
+                                $baseData["2046501458762753_1"] ?? 0, // 929变电所1_风机变低压电流
+                            ],
+                            [
+                                "1#风机变高压",
+                                $baseData["2046501458607105_1"] ?? 0, // 929变电所1_风机变高压电压
+                                $baseData["2046501458643969_1"] ?? 0, // 929变电所1_风机变高压电流
+                            ],
+                            [
+                                "2#动力变高压",
+                                $baseData["2046501459072001_1"] ?? 0, // 929变电所2_动力变高压电压
+                                $baseData["2046501459108865_1"] ?? 0, // 929变电所2_动力变高压电流
+                            ],
+                            [
+                                "2#动力变低压",
+                                $baseData["2046501459184641_1"] ?? 0, // 929变电所2_动力变低压电压
+                                $baseData["2046501459223553_1"] ?? 0, // 929变电所2_动力变低压电流
+                            ],
+                            [
+                                "29D200",
+                                $baseData["2046501453530113_1"] ?? 0, // 29d200 929变电所5201_UB
+                                $baseData["2046501453419521_1"] ?? 0, // 29d200 929变电所5201_IA
+                            ],
+                            [
+                                "29D201",
+                                $baseData["2046501457800193_1"] ?? 0, // 929变电所29D201_UAB
+                                $baseData["2046501457505281_1"] ?? 0, // 929变电所29D201_IA
+                            ],
+                            [
+                                "1#动力变高压",
+                                $baseData["2046501458840577_1"] ?? 0, // 929变电所1_动力变高压电压
+                                $baseData["2046501458879489_1"] ?? 0, // 929变电所1_动力变高压电流
+                            ],
+                            [
+                                "1#动力变低压",
+                                $baseData["2046501458959361_1"] ?? 0, // 929变电所1_动力变低压电压
+                                $baseData["2046501458996225_1"] ?? 0, // 929变电所1_动力变低压电流
+                            ],
+                            [
+                                "29D100",
+                                $baseData["2069518548093953_1"] ?? 0, // 929变电所29D100_Ia
+                                $baseData["2069524603988993_1"] ?? 0, // 929变电所29D100_Uc
+                            ],
+                            [
+                                "29D101",
+                                $baseData["2046501455834113_1"] ?? 0, // 929变电所29D101_IC
+                                $baseData["2046501455954945_1"] ?? 0, // 929变电所29D101_US
+                            ],
+                            [
+                                "29Z104",
+                                $baseData["2046501458457601_1"] ?? 0, // 929变电所29DZ201_UCA z104
+                                $baseData["2046501458533377_1"] ?? 0, // 929变电所29DZ201_IB
+                            ],
+                            [
+                                "29Z103",
+                                $baseData["2069524914854913_1"] ?? 0, // 929变电所29Z103照明_Uca
+                                $baseData["2069525340591105_1"] ?? 0, // 929变电所29Z103照明_Ic
+                            ],
+                            [
+                                "29Z102",
+                                $baseData["2069525769933825_1"] ?? 0, // 929变电所29Z102信息化电源_Uca
+                                $baseData["2069527254408193_1"] ?? 0, // 929变电所29Z102信息化电源_Ib
+                            ],
+                            [
+                                "29Z101",
+                                $baseData["2069527816537089_1"] ?? 0, // 929变电所29Z1014G电源_Uca
+                                $baseData["2069528080405505_1"] ?? 0, // 929变电所29Z1014G电源_Ib
+                            ],
+                        ]
+                    ]
+                ],
+            ]
+        ];
+
+        return json_encode($info);
+    }
+
+    /*
+     * 井下950
+     * */
+    public function getd950List() {
+
+        $keys=[
+            "2046459469167617_2", // 929变电所_5201_开关
+            "2046459469741057_2", // 929变电所_5202_开关
+            "2046459470359553_2", // 929变电所_5203_开关
+            "2046459470935041_2", // 929变电所_5204_开关
+            "2046459471543297_2", // 929变电所_5001_开关
+            "2046459474347009_2", // 929变电所_5205_开关
+            "2046459472092161_2", // 929变电所_5104_开关
+            "2046459472669697_2", // 929变电所_5103_开关
+            "2046459473208321_2", // 929变电所_5102_29102_开关
+            "2046459473783809_2", // 929变电所_5101_开关
+            "2047051390798849_2", // 929_29F102
+            "2046459475362817_2", // 929变电所_29F101_开关合位
+            "2046459475184641_2", // 929变电所_29F100_开关合位
+            "2046459477984257_2", // 929变电所_1号风机变低压_开关
+            "2046459477730305_2", // 929变电所_1号风机变高压_开关
+            "2046459478744065_2", // 929变电所_2号动力变高压_开关
+            "2046459478983681_2", // 929变电所_2号动力变低压_开关
+
+            "2046459475739649_2", // 929变电所_29D201_开关合位
+            "2047198357621761_2", // 929_1#动力变高压
+            "2047198357560321_2", // 929_1#动力变低压
+            "2047210845848577_2", // 929_29D100
+            "2046459474828289_2", // 929变电所_29D101_开关合位
+            "2046459477425153_2", // 929_29Z104
+            "2069539272504321_2", // 929_29Z103
+            "2046459476429825_2", // 929变电所_29DZ102_开关合位
+            "2046459476089857_2", // 929变电所_29DZ101_开关合位
+
+
+            "2046501453607937_1", // 929变电所5201_Q
+            "2046501453569025_1", // 929变电所5201_P
+            "2046501453530113_1", // 929变电所5201_UB
+            "2046501453650945_1", // 929变电所5201_COS
+            "2046501453419521_1", // 929变电所5201_IA
+
+            "2046501453847553_1", // 929变电所5202_Q
+            "2046501453808641_1", // 929变电所5202_P
+            "2046501453771777_1", // 929变电所5202_UB
+            "2046501453886465_1", // 929变电所5202_COS
+            "2046501453689857_1", // 929变电所5202_IA
+
+            "2046501454085121_1", // 929变电所5203_Q
+            "2046501454048257_1", // 929变电所5203_P
+            "2046501454009345_1", // 929变电所5203_UB
+            "2046501454158849_1", // 929变电所5203_COS
+            "2046501453923329_1", // 929变电所5203_IA
+
+            "2046501454357505_1", // 929变电所5204_Q
+            "2046501454318593_1", // 929变电所5204_P
+            "2046501454279681_1", // 929变电所5204_UB
+            "2046501454394369_1", // 929变电所5204_COS
+            "2046501454197761_1", // 929变电所5204_IA
+
+            "2046501454574593_1", // 929变电所5001_Q
+            "2046501454535681_1", // 929变电所5001_P
+            "2046501454498817_1", // 929变电所5001_UB
+            "2046501454621697_1", // 929变电所5001_COS
+            "2046501454429185_1", // 929变电所5001_IA
+
+            "2046501455725569_1", // 929变电所5205_Q
+            "2046501455686657_1", // 929变电所5205_P
+            "2046501455651841_1", // 929变电所5205_UB
+            "2046501455760385_1", // 929变电所5205_COS
+            "2046501455576065_1", // 929变电所5205_IA
+
+            "2046501454834689_1", // 929变电所5104_Q
+            "2046501454799873_1", // 929变电所5104_P
+            "2046501454760961_1", // 929变电所5104_UB
+            "2046501454871553_1", // 929变电所5104_COS
+            "2046501454666753_1", // 929变电所5104_IA
+
+            "2046501455055873_1", // 929变电所5103_Q
+            "2046501455021057_1", // 929变电所5103_P
+            "2046501454984193_1", // 929变电所5103_UB
+            "2046501455092737_1", // 929变电所5103_COS
+            "2046501454906369_1", // 929变电所5103_IA
+
+            "2046501455279105_1", // 929变电所5102_29102_Q
+            "2046501455240193_1", // 929变电所5102_29102_P
+            "2046501455203329_1", // 929变电所5102_29102_UB
+            "2046501455315969_1", // 929变电所5102_29102_COS
+            "2046501455129601_1", // 929变电所5102_29102_IA
+
+            "2046501455498241_1", // 929变电所5101_Q
+            "2046501455465473_1", // 929变电所5101_P
+            "2046501455428609_1", // 929变电所5101_UB
+            "2046501455537153_1", // 929变电所5101_COS
+            "2046501455350785_1", // 929变电所5101_IA
+
+
+            "2046501457140737_1", // 929变电所29F101_UAB
+            "2046501456827393_1", // 929变电所29F101_IA
+
+            "2046501456790529_1", // 929变电所29F100_UAB
+            "2046501456485377_1", // 929变电所29F100_IA
+
+            "2046501458723841_1", // 929变电所1_风机变低压电压
+            "2046501458762753_1", // 929变电所1_风机变低压电流
+
+            "2046501458607105_1", // 929变电所1_风机变高压电压
+            "2046501458643969_1", // 929变电所1_风机变高压电流
+
+            "2046501459072001_1", // 929变电所2_动力变高压电压
+            "2046501459108865_1", // 929变电所2_动力变高压电流
+
+
+            "2046501459184641_1", // 929变电所2_动力变低压电压
+            "2046501459223553_1", // 929变电所2_动力变低压电流
+
+            "2046501457800193_1", // 929变电所29D201_UAB
+            "2046501457505281_1", // 929变电所29D201_IA
+
+            "2046501458840577_1", // 929变电所1_动力变高压电压
+            "2046501458879489_1", // 929变电所1_动力变高压电流
+
+            "2046501458959361_1", // 929变电所1_动力变低压电压
+            "2046501458996225_1", // 929变电所1_动力变低压电流
+
+            "2069518548093953_1", // 929变电所29D100_Ia
+            "2069524603988993_1", // 929变电所29D100_Uc
+
+            "2046501455834113_1", // 929变电所29D101_IC
+            "2046501455954945_1", // 929变电所29D101_US
+
+            "2046501458457601_1", // 929变电所29DZ201_UCA z104
+            "2046501458533377_1", // 929变电所29DZ201_IB
+
+            "2069524914854913_1", // 929变电所29Z103照明_Uca
+            "2069525340591105_1", // 929变电所29Z103照明_Ic
+
+            "2069525769933825_1", // 929变电所29Z102信息化电源_Uca
+            "2069527254408193_1", // 929变电所29Z102信息化电源_Ib
+
+            "2069527816537089_1", // 929变电所29Z1014G电源_Uca
+            "2069528080405505_1", // 929变电所29Z1014G电源_Ib
+
+        ];
+
+        // 获取点位数据
+        $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
+
+
+        $info = [
+            "tip"=>[
+                [
+                    "color"=>"#00FF00",
+                    "text"=>"关"
+                ],
+                [
+                    "color"=>"#FF0000",
+                    "text"=>"开"
+                ],
+            ],
+            "state"=>[
+                ($baseData["2046459469167617_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5201_开关
+                ($baseData["2046459469741057_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5202_开关
+                ($baseData["2046459470359553_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5203_开关
+                ($baseData["2046459470935041_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5204_开关
+                ($baseData["2046459471543297_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5001_开关
+                ($baseData["2046459474347009_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5205_开关
+                ($baseData["2046459472092161_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5104_开关
+                ($baseData["2046459472669697_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5103_开关
+                ($baseData["2046459473208321_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5102_29102_开关
+                ($baseData["2046459473783809_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_5101_开关
+                ($baseData["2047051390798849_2"] ?? 0) <= 0 ? 0 : 1, // 929_29F102
+                ($baseData["2046459475362817_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29F101_开关合位
+                ($baseData["2046459475184641_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29F100_开关合位
+                ($baseData["2046459477984257_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_1号风机变低压_开关
+                ($baseData["2046459477730305_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_1号风机变高压_开关
+                ($baseData["2046459478744065_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_2号动力变高压_开关
+                ($baseData["2046459478983681_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_2号动力变低压_开关
+                0, // 29D200
+                ($baseData["2046459475739649_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29D201_开关合位
+                ($baseData["2047198357621761_2"] ?? 0) <= 0 ? 0 : 1, // 929_1#动力变高压
+                ($baseData["2047198357560321_2"] ?? 0) <= 0 ? 0 : 1, // 929_1#动力变低压
+                ($baseData["2047210845848577_2"] ?? 0) <= 0 ? 0 : 1, // 929_29D100
+                ($baseData["2046459474828289_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29D101_开关合位
+                ($baseData["2046459477425153_2"] ?? 0) <= 0 ? 0 : 1, // 929_29Z104
+                ($baseData["2069539272504321_2"] ?? 0) <= 0 ? 0 : 1, // 929_29Z103
+                ($baseData["2046459476429825_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29DZ102_开关合位
+                ($baseData["2046459476089857_2"] ?? 0) <= 0 ? 0 : 1, // 929变电所_29DZ101_开关合位
+            ],
+            "table_data"=>[
+                [
+                    "title"=>"井下+929m变电所1",
+                    "table"=>[
+                        "thead"=>["名称", "Q:kVar", "p:kw", "Uab:V", "Cos", "Ia:A"],
+                        "tbody"=>[
+                            [
+                                "5201",
+                                $baseData["2046501453607937_1"] ?? 0, // 929变电所5201_Q
+                                $baseData["2046501453569025_1"] ?? 0, // 929变电所5201_P
+                                $baseData["2046501453530113_1"] ?? 0, // 929变电所5201_UB
+                                $baseData["2046501453650945_1"] ?? 0, // 929变电所5201_COS
+                                $baseData["2046501453419521_1"] ?? 0, // 929变电所5201_IA
+                            ],
+                            [
+                                "5202",
+                                $baseData["2046501453847553_1"] ?? 0, // 929变电所5202_Q
+                                $baseData["2046501453808641_1"] ?? 0, // 929变电所5202_P
+                                $baseData["2046501453771777_1"] ?? 0, // 929变电所5202_UB
+                                $baseData["2046501453886465_1"] ?? 0, // 929变电所5202_COS
+                                $baseData["2046501453689857_1"] ?? 0, // 929变电所5202_IA
+                            ],
+                            [
+                                "5203",
+                                $baseData["2046501454085121_1"] ?? 0, // 929变电所5203_Q
+                                $baseData["2046501454048257_1"] ?? 0, // 929变电所5203_P
+                                $baseData["2046501454009345_1"] ?? 0, // 929变电所5203_UB
+                                $baseData["2046501454158849_1"] ?? 0, // 929变电所5203_COS
+                                $baseData["2046501453923329_1"] ?? 0, // 929变电所5203_IA
+                            ],
+                            [
+                                "5204",
+                                $baseData["2046501454357505_1"] ?? 0, // 929变电所5204_Q
+                                $baseData["2046501454318593_1"] ?? 0, // 929变电所5204_P
+                                $baseData["2046501454279681_1"] ?? 0, // 929变电所5204_UB
+                                $baseData["2046501454394369_1"] ?? 0, // 929变电所5204_COS
+                                $baseData["2046501454197761_1"] ?? 0, // 929变电所5204_IA
+                            ],
+                            [
+                                "5001",
+                                $baseData["2046501454574593_1"] ?? 0, // 929变电所5001_Q
+                                $baseData["2046501454535681_1"] ?? 0, // 929变电所5001_P
+                                $baseData["2046501454498817_1"] ?? 0, // 929变电所5001_UB
+                                $baseData["2046501454621697_1"] ?? 0, // 929变电所5001_COS
+                                $baseData["2046501454429185_1"] ?? 0, // 929变电所5001_IA
+                            ],
+                            [
+                                "5205",
+                                $baseData["2046501455725569_1"] ?? 0, // 929变电所5205_Q
+                                $baseData["2046501455686657_1"] ?? 0, // 929变电所5205_P
+                                $baseData["2046501455651841_1"] ?? 0, // 929变电所5205_UB
+                                $baseData["2046501455760385_1"] ?? 0, // 929变电所5205_COS
+                                $baseData["2046501455576065_1"] ?? 0, // 929变电所5205_IA
+                            ],
+                            [
+                                "5104",
+                                $baseData["2046501454834689_1"] ?? 0, // 929变电所5104_Q
+                                $baseData["2046501454799873_1"] ?? 0, // 929变电所5104_P
+                                $baseData["2046501454760961_1"] ?? 0, // 929变电所5104_UB
+                                $baseData["2046501454871553_1"] ?? 0, // 929变电所5104_COS
+                                $baseData["2046501454666753_1"] ?? 0, // 929变电所5104_IA
+                            ],
+                            [
+                                "5103",
+                                $baseData["2046501455055873_1"] ?? 0, // 929变电所5103_Q
+                                $baseData["2046501455021057_1"] ?? 0, // 929变电所5103_P
+                                $baseData["2046501454984193_1"] ?? 0, // 929变电所5103_UB
+                                $baseData["2046501455092737_1"] ?? 0, // 929变电所5103_COS
+                                $baseData["2046501454906369_1"] ?? 0, // 929变电所5103_IA
+                            ],
+                            [
+                                "29G102",
+                                $baseData["2046501455279105_1"] ?? 0, // 929变电所5102_29102_Q
+                                $baseData["2046501455240193_1"] ?? 0, // 929变电所5102_29102_P
+                                $baseData["2046501455203329_1"] ?? 0, // 929变电所5102_29102_UB
+                                $baseData["2046501455315969_1"] ?? 0, // 929变电所5102_29102_COS
+                                $baseData["2046501455129601_1"] ?? 0, // 929变电所5102_29102_IA
+                            ],
+                            [
+                                "5101",
+                                $baseData["2046501455498241_1"] ?? 0, // 929变电所5101_Q
+                                $baseData["2046501455465473_1"] ?? 0, // 929变电所5101_P
+                                $baseData["2046501455428609_1"] ?? 0, // 929变电所5101_UB
+                                $baseData["2046501455537153_1"] ?? 0, // 929变电所5101_COS
+                                $baseData["2046501455350785_1"] ?? 0, // 929变电所5101_IA
+                            ]
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"井下+929m变电所2",
+                    "table"=>[
+                        "thead"=>["名称", "Uab:V", "Ia:A"],
+                        "tbody"=>[
+                            [
+                                "29F102",
+                                "0", "0"
+                            ],
+                            [
+                                "29F101",
+                                $baseData["2046501457140737_1"] ?? 0, // 929变电所29F101_UAB
+                                $baseData["2046501456827393_1"] ?? 0, // 929变电所29F101_IA
+                            ],
+                            [
+                                "29F100",
+                                $baseData["2046501456790529_1"] ?? 0, // 929变电所29F100_UAB
+                                $baseData["2046501456485377_1"] ?? 0, // 929变电所29F100_IA
+                            ],
+                            [
+                                "1#风机变低压",
+                                $baseData["2046501458723841_1"] ?? 0, // 929变电所1_风机变低压电压
+                                $baseData["2046501458762753_1"] ?? 0, // 929变电所1_风机变低压电流
+                            ],
+                            [
+                                "1#风机变高压",
+                                $baseData["2046501458607105_1"] ?? 0, // 929变电所1_风机变高压电压
+                                $baseData["2046501458643969_1"] ?? 0, // 929变电所1_风机变高压电流
+                            ],
+                            [
+                                "2#动力变高压",
+                                $baseData["2046501459072001_1"] ?? 0, // 929变电所2_动力变高压电压
+                                $baseData["2046501459108865_1"] ?? 0, // 929变电所2_动力变高压电流
+                            ],
+                            [
+                                "2#动力变低压",
+                                $baseData["2046501459184641_1"] ?? 0, // 929变电所2_动力变低压电压
+                                $baseData["2046501459223553_1"] ?? 0, // 929变电所2_动力变低压电流
+                            ],
+                            [
+                                "29D200",
+                                $baseData["2046501453530113_1"] ?? 0, // 29d200 929变电所5201_UB
+                                $baseData["2046501453419521_1"] ?? 0, // 29d200 929变电所5201_IA
+                            ],
+                            [
+                                "29D201",
+                                $baseData["2046501457800193_1"] ?? 0, // 929变电所29D201_UAB
+                                $baseData["2046501457505281_1"] ?? 0, // 929变电所29D201_IA
+                            ],
+                            [
+                                "1#动力变高压",
+                                $baseData["2046501458840577_1"] ?? 0, // 929变电所1_动力变高压电压
+                                $baseData["2046501458879489_1"] ?? 0, // 929变电所1_动力变高压电流
+                            ],
+                            [
+                                "1#动力变低压",
+                                $baseData["2046501458959361_1"] ?? 0, // 929变电所1_动力变低压电压
+                                $baseData["2046501458996225_1"] ?? 0, // 929变电所1_动力变低压电流
+                            ],
+                            [
+                                "29D100",
+                                $baseData["2069518548093953_1"] ?? 0, // 929变电所29D100_Ia
+                                $baseData["2069524603988993_1"] ?? 0, // 929变电所29D100_Uc
+                            ],
+                            [
+                                "29D101",
+                                $baseData["2046501455834113_1"] ?? 0, // 929变电所29D101_IC
+                                $baseData["2046501455954945_1"] ?? 0, // 929变电所29D101_US
+                            ],
+                            [
+                                "29Z104",
+                                $baseData["2046501458457601_1"] ?? 0, // 929变电所29DZ201_UCA z104
+                                $baseData["2046501458533377_1"] ?? 0, // 929变电所29DZ201_IB
+                            ],
+                            [
+                                "29Z103",
+                                $baseData["2069524914854913_1"] ?? 0, // 929变电所29Z103照明_Uca
+                                $baseData["2069525340591105_1"] ?? 0, // 929变电所29Z103照明_Ic
+                            ],
+                            [
+                                "29Z102",
+                                $baseData["2069525769933825_1"] ?? 0, // 929变电所29Z102信息化电源_Uca
+                                $baseData["2069527254408193_1"] ?? 0, // 929变电所29Z102信息化电源_Ib
+                            ],
+                            [
+                                "29Z101",
+                                $baseData["2069527816537089_1"] ?? 0, // 929变电所29Z1014G电源_Uca
+                                $baseData["2069528080405505_1"] ?? 0, // 929变电所29Z1014G电源_Ib
+                            ],
+                        ]
+                    ]
+                ],
+            ]
+        ];
+
+        return json_encode($info);
+    }
 }

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

@@ -1390,29 +1390,31 @@ class ZQDcsPumpController  extends BaseController
         ];
         return json_encode($info);
     }
+
     /*
      * 13207
      * */
     public function get13207List() {
 
         $keys=[
+            "2049337304566785_1", // 13207泵房泵号选择
             "2044914761958401_2", // 13207机巷排水系统_1号潜水泵运行反馈
             "2044914761978881_2", // 13207机巷排水系统_2号潜水泵运行反馈
             "2044914761915393_2", // 13207机巷排水系统_3号潜水泵运行反馈
             "2044914761933825_2", // 13207机巷排水系统_4号潜水泵运行反馈
 
+            "2045085417917441_1", // 多级排水_13207低容量设定
+            "2045085261796353_1", // 多级排水_13207高容量设定
+
             "2044914761948161_2", // 13207机巷排水系统_1号水泵运行反馈
             "2044914761968641_2", // 13207机巷排水系统_2号水泵运行反馈
             "2044914761923585_2", // 13207机巷排水系统_3号水泵运行反馈
             "2044914761907201_2", // 13207机巷排水系统_4号水泵运行反馈
 
-            "2044914762050561_1", // 13207机巷排水系统_1号流量计
-            "2044914762093569_1", // 13207机巷排水系统_2号流量计
-
-            "2044914762105857_1",  // 13207机巷排水系统_水仓容量
-
-            "2045085417917441_1", // 多级排水_13207低容量设定
-            "2045085261796353_1", // 多级排水_13207高容量设定
+            "2044914761958401_2", // 13207机巷排水系统_1号潜水泵运行反馈
+            "2044914761978881_2", // 13207机巷排水系统_2号潜水泵运行反馈
+            "2044914761915393_2", // 13207机巷排水系统_3号潜水泵运行反馈
+            "2044914761933825_2", // 13207机巷排水系统_4号潜水泵运行反馈
         ];
 
         // 获取点位数据
@@ -1453,6 +1455,11 @@ class ZQDcsPumpController  extends BaseController
                     "unit"=>"m³"
                 ],
                 [
+                    "label"=>"泵房泵号选择",
+                    "value"=> $baseData['2049337304566785_1'] ?? 0,
+                    "unit"=>"m³"
+                ],
+                [
                     "label"=>"仓容上限",
                     "value"=> $baseData['2045085261796353_1'] ?? 0,
                     "unit"=>"m³"
@@ -1472,6 +1479,13 @@ class ZQDcsPumpController  extends BaseController
                     ],
                 ],
                 [
+                    "label"=>"1#潜水泵",
+                    "state"=> $stateData['2044914761958401_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761958401_2'] ?? "未知",
+                    "table"=>[
+                    ],
+                ],
+                [
                     "label"=>"2#水泵",
                     "state"=> $stateData['2044914761968641_2'] ?? "0",
                     "text"=> $stateInfoData['2044914761968641_2'] ?? "未知",
@@ -1479,6 +1493,13 @@ class ZQDcsPumpController  extends BaseController
                     ],
                 ],
                 [
+                    "label"=>"2#潜水泵",
+                    "state"=> $stateData['2044914761978881_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761978881_2'] ?? "未知",
+                    "table"=>[
+                    ],
+                ],
+                [
                     "label"=>"3#水泵",
                     "state"=> $stateData['2044914761923585_2'] ?? "0",
                     "text"=> $stateInfoData['2044914761923585_2'] ?? "未知",
@@ -1486,42 +1507,29 @@ class ZQDcsPumpController  extends BaseController
                     ],
                 ],
                 [
+                    "label"=>"3#潜水泵",
+                    "state"=> $stateData['2044914761915393_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761915393_2'] ?? "未知",
+                    "table"=>[
+                    ],
+                ],
+                [
                     "label"=>"4#水泵",
                     "state"=> $stateData['2044914761907201_2'] ?? "0",
                     "text"=> $stateInfoData['2044914761907201_2'] ?? "未知",
                     "table"=>[
                     ],
                 ],
-//                [
-//                    "title"=>"1#潜水泵",
-//                    "state"=>$baseData['2044914761958401_2'] ?? 0,
-//                    "text"=>($baseData['2044914761958401_2'] ?? 0) > 0 ? "开启" : "关闭" ,
-//                    "table"=>[
-//                    ],
-//                ],
-//                [
-//                    "title"=>"2#潜水泵",
-//                    "state"=>$baseData['2044914761978881_2'] ?? 0,
-//                    "text"=>($baseData['2044914761978881_2'] ?? 0) > 0 ? "开启" : "关闭" ,
-//                    "table"=>[
-//                    ],
-//                ],
-//                [
-//                    "title"=>"3#潜水泵",
-//                    "state"=>$baseData['2044914761915393_2'] ?? 0,
-//                    "text"=>($baseData['2044914761915393_2'] ?? 0) > 0 ? "开启" : "关闭" ,
-//                    "table"=>[
-//                    ],
-//                ],
-//                [
-//                    "title"=>"4#潜水泵",
-//                    "state"=>$baseData['2044914761933825_2'] ?? 0,
-//                    "text"=>($baseData['2044914761933825_2'] ?? 0) > 0 ? "开启" : "关闭" ,
-//                    "table"=>[
-//                    ],
-//                ],
+                [
+                    "label"=>"4#潜水泵",
+                    "state"=> $stateData['2044914761933825_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761933825_2'] ?? "未知",
+                    "table"=>[
+                    ],
+                ],
             ]
         ];
+
         return json_encode($info);
     }
 
@@ -1722,16 +1730,28 @@ class ZQDcsPumpController  extends BaseController
     public function get5000fList() {
 
         $keys=[
-            "2044016878388225_1", //多级排水系统_液位1
-            "2044016878400513_1", //多级排水系统_液位2
-            "2044016878099457_2", //多级排水系统_闸阀1关到位
-            "2044016878083073_2", //多级排水系统_闸阀1开到位
-            "2044016878177281_2", //多级排水系统_闸阀2关到位
-            "2044016878164993_2", //多级排水系统_闸阀2开到位
-            "2044016878248961_2", //多级排水系统_闸阀3关到位
-            "2044016878232577_2", //多级排水系统_闸阀3开到位
-            "2044016878304257_2", //多级排水系统_闸阀4关到位
-            "2044016878296065_2", //多级排水系统_闸阀4开到位
+            "2044016878083073_2", // 多级排水系统_闸阀1开到位
+            "2044016878164993_2", // 多级排水系统_闸阀2开到位
+            "2044016878232577_2", // 多级排水系统_闸阀3开到位
+            "2044016878296065_2", // 多级排水系统_闸阀4开到位
+
+            "2044016878388225_1", // 多级排水系统_液位1
+            "2044016878400513_1", // 多级排水系统_液位2
+
+            "2044016878451713_1", // 多级排水系统_水池1超高液位设定
+            "2044016878416897_1", // 多级排水系统_水池1低液位设定
+            "2044016878431233_1", // 多级排水系统_水池1高液位设定
+
+            "2044016878504961_1", // 多级排水系统_水池2超高液位设定
+            "2044016878466049_1", // 多级排水系统_水池2低液位设定
+            "2044016878480385_1", // 多级排水系统_水池2高液位设定
+            "2052698829423617_1", // 矿井水总进水量累计流量
+            "2052671000642561_1", // 累计流量
+            "2052698691959809_1", // 污水处理厂累计流量
+            "2049343208078337_2", // 5000方水池1超高液位报警
+            "2049343147056129_2", // 5000方水池1高液位报警
+            "2049343267609601_2", // 5000方水池2超高液位报警
+            "2049343309526017_2", // 5000方水池2高液位报警
         ];
 
         // 获取点位数据
@@ -1755,43 +1775,106 @@ class ZQDcsPumpController  extends BaseController
         }
 
         $info = [
-            "main"=>[
+            "info"=> [
                 [
-                    "label"=>"液位1",
-                    "value"=> $baseData['2044016878388225_1'] ?? 0,
-                    "unit"=>"M"
-                ],
-                [
-                    "label"=>"液位2",
-                    "value"=> $baseData['2044016878400513_1'] ?? 0,
-                    "unit"=>"M"
+                    "title"=>"来自950水泵房",
+                    "data"=>[
+                        [
+                            "label"=>"1号闸阀",
+                            "state" => $baseData['2044016878083073_2']
+                        ],
+                        [
+                            "label"=>"3号闸阀",
+                            "state" => $baseData['2044016878232577_2']
+                        ],
+                    ]
                 ],
                 [
-                    "label"=>"1号闸阀",
-                    "value"=> $baseData['2044016878083073_2'] == 1 ? "开" : "关",
-                    "unit"=>""
+                    "title"=>"来自950水泵房",
+                    "data"=>[
+                        [
+                            "label"=>"2号闸阀",
+                            "state" => $baseData['2044016878164993_2']
+                        ],
+                        [
+                            "label"=>"4号闸阀",
+                            "state" => $baseData['2044016878296065_2']
+                        ],
+                    ]
                 ],
+            ],
+            "tab_info"=>[
                 [
-                    "label"=>"2号闸阀",
-                    "value"=> $baseData['2044016878164993_2'] == 1 ? "开" : "关",
-                    "unit"=>""
+                    "title"=>"累计流量",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"矿井水总进水量累计流量（m³）",
+                                "value"=>$baseData['2052698829423617_1']
+                            ],
+                            [
+                                "label"=>"累计流量（m³）",
+                                "value"=>$baseData['2052671000642561_1']
+                            ],
+                            [
+                                "label"=>"污水处理厂累计流量（m）",
+                                "value"=>$baseData['2052698691959809_1']
+                            ]
+                        ]
+                    ]
                 ],
                 [
-                    "label"=>"3号闸阀",
-                    "value"=> $baseData['2044016878232577_2'] == 1 ? "开" : "关",
-                    "unit"=>""
+                    "title"=>"1号水池",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"液位（m）",
+                                "value"=>$baseData['2044016878388225_1']
+                            ],
+                            [
+                                "label"=>"超高液位设定值（m）",
+                                "value"=>$baseData['2044016878451713_1']
+                            ],
+                            [
+                                "label"=>"高液位设定值（m）",
+                                "value"=>$baseData['2044016878431233_1']
+                            ],
+                            [
+                                "label"=>"低液位设定值（m）",
+                                "value"=>$baseData['2044016878416897_1']
+                            ]
+                        ]
+                    ]
                 ],
                 [
-                    "label"=>"4号闸阀",
-                    "value"=> $baseData['2044016878296065_2'] == 1 ? "开" : "关",
-                    "unit"=>""
-                ],
+                    "title"=>"2号水池",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"液位（m）",
+                                "value"=>$baseData['2044016878400513_1']
+                            ],
+                            [
+                                "label"=>"超高液位设定值（m）",
+                                "value"=>$baseData['2044016878504961_1']
+                            ],
+                            [
+                                "label"=>"高液位设定值（m）",
+                                "value"=>$baseData['2044016878480385_1']
+                            ],
+                            [
+                                "label"=>"低液位设定值（m）",
+                                "value"=>$baseData['2044016878466049_1']
+                            ]
+                        ]
+                    ]
+                ]
             ],
-            "info"=>[
-                [
-                ],
-            ]
         ];
+
         return json_encode($info);
     }
 

Modules/OpcData/Routes/api.php

@@ -34,6 +34,8 @@ Route::namespace('Api')->group(function () {
     Route::any('zaoquan/dcs/an', 'zaoquan\\ZQDcsAirAndNitrogenController@getList'); // 压风制氮
     Route::any('zaoquan/dcs/pump', 'zaoquan\\ZQDcsPumpController@getList'); // 水泵
     Route::any('zaoquan/dcs/power', 'zaoquan\\ZQDcsPowerController@getList'); // 电力
+    Route::any('zaoquan/dcs/getSupport', 'zaoquan\\ZQDcsSupportController@getList'); // 支架
+
+    Route::any('zaoquan/dcs/dustMonitor', 'zaoquan\\ZQDcsSupportController@getDustMonitorList'); // 扬尘
 
-    Route::any('zaoquan/dcs/getSupport', 'zaoquan\\ZQDcsSupportController@getList');
 });

Modules/OpcData/Services/zaoquan/ZQDcsApiService.php

@@ -8,6 +8,7 @@ class ZQDcsApiService
 {
 
     protected $client;
+    public $rawData, $rawArr = [];
 
     public function __construct()
     {
@@ -29,6 +30,7 @@ class ZQDcsApiService
         return $data;
     }
 
+    // 获取实时数据
     public function postPointRealData($apiUrl, $pointIds) {
 
         // 发送 HTTP POST 请求
@@ -55,10 +57,42 @@ class ZQDcsApiService
 
         $transformedData['data'] = $this->transformData($data);
         $transformedData['IsSuccessful'] =1;
+        $this->rawData = $data;
 
         return $transformedData;
     }
 
+    // 获取历史数据
+    public function postDcsHisData($pointIds, $startTime, $endTime)
+    {
+        $apiUrl = "http://7.250.4.3:4200/v1/common/GetPointDataFromInfluxDB";
+
+        // 发送 HTTP POST 请求
+        $response = $this->client->post($apiUrl, [
+            'headers' => [
+                'Authorization' => 'Bearer appkey_100100',
+                'Content-Type'=>'application/json; charset=utf-8',
+                // 其他头部信息
+            ],
+            'json' =>[
+                'IDs' => $pointIds,
+                'StartTime' => $startTime,
+                'EndTime' => $endTime
+            ]
+        ]);
+        // 获取 API 响应的 JSON 数据
+        $res = json_decode($response->getBody(), true);
+
+        if($res['IsSuccessful'] == 0) {
+            return $res;
+        }
+
+        $data = isset($res['Data'])? $res['Data']: null;
+        return $data;
+    }
+
+
+
     public function postApiData($apiUrl, $postData = '')
     {
         // 发送 HTTP POST 请求
@@ -75,9 +109,10 @@ class ZQDcsApiService
                 'PageNum'=>"-1"
             ]
         ]);
-        return $response;
+
         // 获取 API 响应的 JSON 数据
         $data = json_decode($response->getBody(), true);
+        return $data;
 
         // 对数据进行重组，这里只是一个示例，具体根据实际需求调整
         $transformedData = $this->transformData($data);
@@ -85,6 +120,7 @@ class ZQDcsApiService
         return $transformedData;
     }
 
+
     protected function transformData($data)
     {
 
@@ -94,6 +130,7 @@ class ZQDcsApiService
             $pid = $dic['ID'];
             $val = $dic['V'];
             $transformedData[$pid]=$val;
+            $this->rawArr[$pid]=$dic;
         }
         return $transformedData;
     }

Modules/OpcData/Services/zaoquan/ZQDcsOpcService.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Modules\OpcData\Services\zaoquan;
+
+use GuzzleHttp\Client;
+
+class ZQDcsOpcService
+{
+    public $python_path = [
+        'keyword' => '/usr/bin/python311',
+        'curr'=>[
+            'path' => '/home/python_proj/python_custom_script/zaoquan/dcs/',
+            'fname' => 'test1.py',
+        ],
+        'zq' =>[
+            'name' => 'zaoquan',
+            'path' => '/home/python_proj/python_custom_script/zaoquan/dcs/',
+            'fname' => 'test1.py',
+        ]
+    ];
+
+    public function getDcsOpcData($pointArr, $sys_name='curr') {
+
+
+        if(!is_array($pointArr)) null;
+
+        $sysInfo = $this->python_path[$sys_name];
+
+        $pids = $pointArr;
+
+        $pyPath = $sysInfo['path'];
+        $pyFName = $sysInfo['fname'];
+        $pyKeyWord = $this->python_path['keyword'];
+
+        $pidsJson = json_encode($pids);
+
+        $command = "$pyKeyWord {$pyPath}{$pyFName}". ' ' . escapeshellarg("{$pidsJson}");
+
+        // 调用Python脚本
+        $output = shell_exec($command);
+        return $output;
+
+    }
+}