枣泉数据

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

@@ -37,8 +37,8 @@ class ZQDcsWorkFaceController  extends BaseController
             switch ($sysCode) {
                 case '220707gzm': // 220707工作面
                     return $this->get220707GzmList();
-                case '150202gzm': // 220707工作面
-                    return $this->get220707GzmList();
+                case '150202gzm': // 150202工作面
+                    return $this->get150202GzmList();
                 case 'rhb': // 乳化泵
                     return $this->getRhbList();
                 case 'cmj': // 采煤机
@@ -216,25 +216,37 @@ class ZQDcsWorkFaceController  extends BaseController
         $info = [
             "info"=>[
                 [
-                    "label"=> "机身高度",
-                    "value"=> "1321mm"
+                    "label"=> "设计可采长度",
+                    "value"=> "2159M"
+                ],
+                [
+                    "label"=> "开采煤层",
+                    "value"=> "7"
+                ],
+                [
+                    "label"=> "面积",
+                    "value"=> "450301㎡"
                 ],
                 [
-                    "label"=> "总装机功率",
-                    "value"=> "1660kw"
+                    "label"=> "煤层总厚",
+                    "value"=> "3.9M"
                 ],
                 [
-                    "label"=> "滚筒转速",
-                    "value"=> "36.2r/min"
+                    "label"=> "工作面采高",
+                    "value"=> "2.6M"
                 ],
                 [
-                    "label"=> "摇臂长度",
-                    "value"=> "32656mm"
+                    "label"=> "支架数目",
+                    "value"=> "130"
                 ],
                 [
-                    "label"=> "采高范围",
-                    "value"=> "1.9~3.7m"
+                    "label"=> "循环刀数",
+                    "value"=> "12"
                 ],
+                [
+                    "label"=> "回踩日期",
+                    "value"=> "2023.11"
+                ]
             ],
             "ruhuabeng"=>[
                 [
@@ -494,11 +506,15 @@ class ZQDcsWorkFaceController  extends BaseController
         // 设置时区为东八区，即 UTC+8
         date_default_timezone_set('Asia/Shanghai');
 
-        // 获取昨天的日期时间
-        $startTime = new DateTime('yesterday 07:00:00');
-        // 获取今天的日期时间
+        // 获取当前时间
         $endTime = new DateTime('now');
-        $endTime->setTime(23, 59, 59); // 设置时间为23:59:59
+        // 获取当前时间向前推1小时的时间
+        $startTime = clone $endTime; // 复制当前时间的实例
+        $startTime->modify('-3 hour'); // 向前推1小时
+
+        // 输出昨天和今天的日期时间
+        $starttime = $startTime->format('Y-m-d\TH:i:sP');
+        $endtime = $endTime->format('Y-m-d\TH:i:sP');
 
         // 输出昨天和今天的日期时间
         $starttime = $startTime->format('Y-m-d\TH:i:sP');
@@ -518,7 +534,7 @@ class ZQDcsWorkFaceController  extends BaseController
         // 使用 DateTime 类格式化日期
         $hisTime = array_map(function($date) {
             $dateTime = new DateTime($date);
-            return $dateTime->format('m-d H:i:s');
+            return $dateTime->format('H:i');
         }, $hisTime);
 
         $info = [