秦锐 пре 3 година
родитељ
комит
6ea5e3bff8
100 измењених фајлова са 58 додато и 47 уклоњено
  1. 58 47
      Modules/OpcData/Http/Controllers/Api/OpcDataController.php
  2. 0 0
      public/.htaccess
  3. 0 0
      public/css/app.css
  4. 0 0
      public/favicon.ico
  5. 0 0
      public/files/返回.png
  6. 0 0
      public/index.php
  7. 0 0
      public/js/admin/layui/admin.js
  8. 0 0
      public/js/admin/layui/css/layui.css
  9. 0 0
      public/js/admin/layui/css/layui.mobile.css
  10. 0 0
      public/js/admin/layui/css/modules/code.css
  11. 0 0
      public/js/admin/layui/css/modules/laydate/default/laydate.css
  12. 0 0
      public/js/admin/layui/css/modules/layer/default/icon-ext.png
  13. 0 0
      public/js/admin/layui/css/modules/layer/default/icon.png
  14. 0 0
      public/js/admin/layui/css/modules/layer/default/layer.css
  15. 0 0
      public/js/admin/layui/css/modules/layer/default/loading-0.gif
  16. 0 0
      public/js/admin/layui/css/modules/layer/default/loading-1.gif
  17. 0 0
      public/js/admin/layui/css/modules/layer/default/loading-2.gif
  18. 0 0
      public/js/admin/layui/eleDel.js
  19. 0 0
      public/js/admin/layui/extends/authtree.js
  20. 0 0
      public/js/admin/layui/extends/eleTree.js
  21. 0 0
      public/js/admin/layui/extends/formSelects-v4.min.js
  22. 0 0
      public/js/admin/layui/extends/selectM.js
  23. 0 0
      public/js/admin/layui/extends/selectN.js
  24. 0 0
      public/js/admin/layui/extends/tabmenu.js
  25. 0 0
      public/js/admin/layui/font/iconfont.eot
  26. 0 0
      public/js/admin/layui/font/iconfont.svg
  27. 0 0
      public/js/admin/layui/font/iconfont.ttf
  28. 0 0
      public/js/admin/layui/font/iconfont.woff
  29. 0 0
      public/js/admin/layui/font/iconfont.woff2
  30. 0 0
      public/js/admin/layui/images/face/0.gif
  31. 0 0
      public/js/admin/layui/images/face/1.gif
  32. 0 0
      public/js/admin/layui/images/face/10.gif
  33. 0 0
      public/js/admin/layui/images/face/11.gif
  34. 0 0
      public/js/admin/layui/images/face/12.gif
  35. 0 0
      public/js/admin/layui/images/face/13.gif
  36. 0 0
      public/js/admin/layui/images/face/14.gif
  37. 0 0
      public/js/admin/layui/images/face/15.gif
  38. 0 0
      public/js/admin/layui/images/face/16.gif
  39. 0 0
      public/js/admin/layui/images/face/17.gif
  40. 0 0
      public/js/admin/layui/images/face/18.gif
  41. 0 0
      public/js/admin/layui/images/face/19.gif
  42. 0 0
      public/js/admin/layui/images/face/2.gif
  43. 0 0
      public/js/admin/layui/images/face/20.gif
  44. 0 0
      public/js/admin/layui/images/face/21.gif
  45. 0 0
      public/js/admin/layui/images/face/22.gif
  46. 0 0
      public/js/admin/layui/images/face/23.gif
  47. 0 0
      public/js/admin/layui/images/face/24.gif
  48. 0 0
      public/js/admin/layui/images/face/25.gif
  49. 0 0
      public/js/admin/layui/images/face/26.gif
  50. 0 0
      public/js/admin/layui/images/face/27.gif
  51. 0 0
      public/js/admin/layui/images/face/28.gif
  52. 0 0
      public/js/admin/layui/images/face/29.gif
  53. 0 0
      public/js/admin/layui/images/face/3.gif
  54. 0 0
      public/js/admin/layui/images/face/30.gif
  55. 0 0
      public/js/admin/layui/images/face/31.gif
  56. 0 0
      public/js/admin/layui/images/face/32.gif
  57. 0 0
      public/js/admin/layui/images/face/33.gif
  58. 0 0
      public/js/admin/layui/images/face/34.gif
  59. 0 0
      public/js/admin/layui/images/face/35.gif
  60. 0 0
      public/js/admin/layui/images/face/36.gif
  61. 0 0
      public/js/admin/layui/images/face/37.gif
  62. 0 0
      public/js/admin/layui/images/face/38.gif
  63. 0 0
      public/js/admin/layui/images/face/39.gif
  64. 0 0
      public/js/admin/layui/images/face/4.gif
  65. 0 0
      public/js/admin/layui/images/face/40.gif
  66. 0 0
      public/js/admin/layui/images/face/41.gif
  67. 0 0
      public/js/admin/layui/images/face/42.gif
  68. 0 0
      public/js/admin/layui/images/face/43.gif
  69. 0 0
      public/js/admin/layui/images/face/44.gif
  70. 0 0
      public/js/admin/layui/images/face/45.gif
  71. 0 0
      public/js/admin/layui/images/face/46.gif
  72. 0 0
      public/js/admin/layui/images/face/47.gif
  73. 0 0
      public/js/admin/layui/images/face/48.gif
  74. 0 0
      public/js/admin/layui/images/face/49.gif
  75. 0 0
      public/js/admin/layui/images/face/5.gif
  76. 0 0
      public/js/admin/layui/images/face/50.gif
  77. 0 0
      public/js/admin/layui/images/face/51.gif
  78. 0 0
      public/js/admin/layui/images/face/52.gif
  79. 0 0
      public/js/admin/layui/images/face/53.gif
  80. 0 0
      public/js/admin/layui/images/face/54.gif
  81. 0 0
      public/js/admin/layui/images/face/55.gif
  82. 0 0
      public/js/admin/layui/images/face/56.gif
  83. 0 0
      public/js/admin/layui/images/face/57.gif
  84. 0 0
      public/js/admin/layui/images/face/58.gif
  85. 0 0
      public/js/admin/layui/images/face/59.gif
  86. 0 0
      public/js/admin/layui/images/face/6.gif
  87. 0 0
      public/js/admin/layui/images/face/60.gif
  88. 0 0
      public/js/admin/layui/images/face/61.gif
  89. 0 0
      public/js/admin/layui/images/face/62.gif
  90. 0 0
      public/js/admin/layui/images/face/63.gif
  91. 0 0
      public/js/admin/layui/images/face/64.gif
  92. 0 0
      public/js/admin/layui/images/face/65.gif
  93. 0 0
      public/js/admin/layui/images/face/66.gif
  94. 0 0
      public/js/admin/layui/images/face/67.gif
  95. 0 0
      public/js/admin/layui/images/face/68.gif
  96. 0 0
      public/js/admin/layui/images/face/69.gif
  97. 0 0
      public/js/admin/layui/images/face/7.gif
  98. 0 0
      public/js/admin/layui/images/face/70.gif
  99. 0 0
      public/js/admin/layui/images/face/71.gif
  100. 0 0
      public/js/admin/layui/images/face/8.gif

+ 58 - 47
Modules/OpcData/Http/Controllers/Api/OpcDataController.php

@@ -4,6 +4,7 @@ namespace Modules\OpcData\Http\Controllers\Api;
 
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\DB;
 use Modules\OpcData\Entities\OpcDataDict;
@@ -85,60 +86,70 @@ class OpcDataController extends Controller
 
     public function getData(Request $request)
     {
-        // dd($request->all());
-        // $model = new OpcDataDict();
-        // $dictData = OpcDataDict::where();
-        // dd($dictData);
+        $getDataType = $request->system_type;   // 获取需要的数据
+        $dataArr = array();                     // 返回数据数组
         $db = DB::connection('mysql_opc_jinjiaqu');
-        $sqlStr = "
-         select t1.fan_type_id,
-                t1.fan_type_name,
-                t1.device_num,
-                t1.device_name,
-                case t.val 
-                    when 'True' then 1
-                    when 'False' then 2
-                    else t.val
-                end val,
-                t1.json_key,
-                t1.row_number,
-                t1.unit
-          from equipment t
-          join tb_fan_dict_list t1 on t.selItem = t1.selItem
-         where t1.group_id = 1
-           and t1.is_show = 1
-         order by t1.fan_type_id, t1.row_number, t1.device_num
-        ";
         
-        $dbResult = $db->select($sqlStr);
-        $dataArr = array();
-        foreach ($dbResult as $key => $val) {
-            $fanNum     = $val->fan_type_id - 1;        // 风机号
-            $label      = $val->device_name;            // 设备名
-            $devVal     = $val->val;                    // 数值
-            $jsonKey   = $val->json_key;               // json键值
-            $unit       = $val->unit;                   // 单位
-            $dataArr[$fanNum]['title'] = $val->fan_type_name; // 风机名
-            $valArr = [
-                'label' => $label,      // 标题
-                'unit'  => $unit        // 单位
-            ];
-            // 状态与value
-            if($jsonKey == 'state_list') {
-                $valArr['state'] = $devVal;
+        if ($getDataType == 'ventilation_zb' or $getDataType == 'ventilation_bb' ) {
+            
+            $groupId = 1;    // 设备分组ID
+            if ($getDataType == 'ventilation_zb'){
+                $groupId = 1;
+            } else if ($getDataType == 'ventilation_bb') {
+                $groupId = 2;
             } else {
-                $valArr['value'] = $devVal;
+                return;
             }
-            // 根据风量判断风机开关
-            if($label == '风量') {
-                if ($devVal <= 0 ) {
-                    $dataArr[$fanNum]['state'] = 2;
+
+            $sqlStr = "
+            select t1.fan_type_id,
+                    t1.fan_type_name,
+                    t1.device_num,
+                    t1.device_name,
+                    case t.val 
+                        when 'True' then 1
+                        when 'False' then 2
+                        else t.val
+                    end val,
+                    t1.json_key,
+                    t1.row_number,
+                    t1.unit
+            from equipment t
+            join tb_fan_dict_list t1 on t.selItem = t1.selItem
+            where t1.group_id = ".$groupId."
+            and t1.is_show = 1
+            order by t1.fan_type_id, t1.row_number, t1.device_num
+            ";
+            
+            $dbResult = $db->select($sqlStr);
+            foreach ($dbResult as $key => $val) {
+                $fanNum     = $val->fan_type_id - 1;        // 风机号
+                $label      = $val->device_name;            // 设备名
+                $devVal     = $val->val;                    // 数值
+                $jsonKey   = $val->json_key;               // json键值
+                $unit       = $val->unit;                   // 单位
+                $dataArr[$fanNum]['title'] = $val->fan_type_name; // 风机名
+                $valArr = [
+                    'label' => $label,      // 标题
+                    'unit'  => $unit        // 单位
+                ];
+                // 状态与value
+                if($jsonKey == 'state_list') {
+                    $valArr['state'] = $devVal;
                 } else {
-                    $dataArr[$fanNum]['state'] = 1;
+                    $valArr['value'] = $devVal;
                 }
+                // 根据风量判断风机开关
+                if($label == '风量') {
+                    if ($devVal <= 0 ) {
+                        $dataArr[$fanNum]['state'] = 2;
+                    } else {
+                        $dataArr[$fanNum]['state'] = 1;
+                    }
+                }
+                $dataArr[$fanNum][$jsonKey][] = $valArr;
+                
             }
-            $dataArr[$fanNum][$jsonKey][] = $valArr;
-            
         }
         return response()->json($dataArr);
     }

+ 0 - 0
public/.htaccess


+ 0 - 0
public/css/app.css


+ 0 - 0
public/favicon.ico


+ 0 - 0
public/files/返回.png


+ 0 - 0
public/index.php


+ 0 - 0
public/js/admin/layui/admin.js


+ 0 - 0
public/js/admin/layui/css/layui.css


+ 0 - 0
public/js/admin/layui/css/layui.mobile.css


+ 0 - 0
public/js/admin/layui/css/modules/code.css


+ 0 - 0
public/js/admin/layui/css/modules/laydate/default/laydate.css


+ 0 - 0
public/js/admin/layui/css/modules/layer/default/icon-ext.png


+ 0 - 0
public/js/admin/layui/css/modules/layer/default/icon.png


+ 0 - 0
public/js/admin/layui/css/modules/layer/default/layer.css


+ 0 - 0
public/js/admin/layui/css/modules/layer/default/loading-0.gif


+ 0 - 0
public/js/admin/layui/css/modules/layer/default/loading-1.gif


+ 0 - 0
public/js/admin/layui/css/modules/layer/default/loading-2.gif


+ 0 - 0
public/js/admin/layui/eleDel.js


+ 0 - 0
public/js/admin/layui/extends/authtree.js


+ 0 - 0
public/js/admin/layui/extends/eleTree.js


+ 0 - 0
public/js/admin/layui/extends/formSelects-v4.min.js


+ 0 - 0
public/js/admin/layui/extends/selectM.js


+ 0 - 0
public/js/admin/layui/extends/selectN.js


+ 0 - 0
public/js/admin/layui/extends/tabmenu.js


+ 0 - 0
public/js/admin/layui/font/iconfont.eot


+ 0 - 0
public/js/admin/layui/font/iconfont.svg


+ 0 - 0
public/js/admin/layui/font/iconfont.ttf


+ 0 - 0
public/js/admin/layui/font/iconfont.woff


+ 0 - 0
public/js/admin/layui/font/iconfont.woff2


+ 0 - 0
public/js/admin/layui/images/face/0.gif


+ 0 - 0
public/js/admin/layui/images/face/1.gif


+ 0 - 0
public/js/admin/layui/images/face/10.gif


+ 0 - 0
public/js/admin/layui/images/face/11.gif


+ 0 - 0
public/js/admin/layui/images/face/12.gif


+ 0 - 0
public/js/admin/layui/images/face/13.gif


+ 0 - 0
public/js/admin/layui/images/face/14.gif


+ 0 - 0
public/js/admin/layui/images/face/15.gif


+ 0 - 0
public/js/admin/layui/images/face/16.gif


+ 0 - 0
public/js/admin/layui/images/face/17.gif


+ 0 - 0
public/js/admin/layui/images/face/18.gif


+ 0 - 0
public/js/admin/layui/images/face/19.gif


+ 0 - 0
public/js/admin/layui/images/face/2.gif


+ 0 - 0
public/js/admin/layui/images/face/20.gif


+ 0 - 0
public/js/admin/layui/images/face/21.gif


+ 0 - 0
public/js/admin/layui/images/face/22.gif


+ 0 - 0
public/js/admin/layui/images/face/23.gif


+ 0 - 0
public/js/admin/layui/images/face/24.gif


+ 0 - 0
public/js/admin/layui/images/face/25.gif


+ 0 - 0
public/js/admin/layui/images/face/26.gif


+ 0 - 0
public/js/admin/layui/images/face/27.gif


+ 0 - 0
public/js/admin/layui/images/face/28.gif


+ 0 - 0
public/js/admin/layui/images/face/29.gif


+ 0 - 0
public/js/admin/layui/images/face/3.gif


+ 0 - 0
public/js/admin/layui/images/face/30.gif


+ 0 - 0
public/js/admin/layui/images/face/31.gif


+ 0 - 0
public/js/admin/layui/images/face/32.gif


+ 0 - 0
public/js/admin/layui/images/face/33.gif


+ 0 - 0
public/js/admin/layui/images/face/34.gif


+ 0 - 0
public/js/admin/layui/images/face/35.gif


+ 0 - 0
public/js/admin/layui/images/face/36.gif


+ 0 - 0
public/js/admin/layui/images/face/37.gif


+ 0 - 0
public/js/admin/layui/images/face/38.gif


+ 0 - 0
public/js/admin/layui/images/face/39.gif


+ 0 - 0
public/js/admin/layui/images/face/4.gif


+ 0 - 0
public/js/admin/layui/images/face/40.gif


+ 0 - 0
public/js/admin/layui/images/face/41.gif


+ 0 - 0
public/js/admin/layui/images/face/42.gif


+ 0 - 0
public/js/admin/layui/images/face/43.gif


+ 0 - 0
public/js/admin/layui/images/face/44.gif


+ 0 - 0
public/js/admin/layui/images/face/45.gif


+ 0 - 0
public/js/admin/layui/images/face/46.gif


+ 0 - 0
public/js/admin/layui/images/face/47.gif


+ 0 - 0
public/js/admin/layui/images/face/48.gif


+ 0 - 0
public/js/admin/layui/images/face/49.gif


+ 0 - 0
public/js/admin/layui/images/face/5.gif


+ 0 - 0
public/js/admin/layui/images/face/50.gif


+ 0 - 0
public/js/admin/layui/images/face/51.gif


+ 0 - 0
public/js/admin/layui/images/face/52.gif


+ 0 - 0
public/js/admin/layui/images/face/53.gif


+ 0 - 0
public/js/admin/layui/images/face/54.gif


+ 0 - 0
public/js/admin/layui/images/face/55.gif


+ 0 - 0
public/js/admin/layui/images/face/56.gif


+ 0 - 0
public/js/admin/layui/images/face/57.gif


+ 0 - 0
public/js/admin/layui/images/face/58.gif


+ 0 - 0
public/js/admin/layui/images/face/59.gif


+ 0 - 0
public/js/admin/layui/images/face/6.gif


+ 0 - 0
public/js/admin/layui/images/face/60.gif


+ 0 - 0
public/js/admin/layui/images/face/61.gif


+ 0 - 0
public/js/admin/layui/images/face/62.gif


+ 0 - 0
public/js/admin/layui/images/face/63.gif


+ 0 - 0
public/js/admin/layui/images/face/64.gif


+ 0 - 0
public/js/admin/layui/images/face/65.gif


+ 0 - 0
public/js/admin/layui/images/face/66.gif


+ 0 - 0
public/js/admin/layui/images/face/67.gif


+ 0 - 0
public/js/admin/layui/images/face/68.gif


+ 0 - 0
public/js/admin/layui/images/face/69.gif


+ 0 - 0
public/js/admin/layui/images/face/7.gif


+ 0 - 0
public/js/admin/layui/images/face/70.gif


+ 0 - 0
public/js/admin/layui/images/face/71.gif


+ 0 - 0
public/js/admin/layui/images/face/8.gif


Неке датотеке нису приказане због велике количине промена