|
@@ -54,16 +54,17 @@ class OpcDataController extends Controller
|
|
|
|
|
|
public function getData(Request $request)
|
|
|
{
|
|
|
- $getDataType = $request->system_type; // 获取需要的数据
|
|
|
- $getMineCode = $request->mine_code; // 矿分类
|
|
|
+ $getDataType = isset($request->system_type); // 获取需要的数据
|
|
|
+ $getMineCode = isset($request->mine_code); // 矿分类
|
|
|
$dataArr = array(); // 返回数据数组
|
|
|
|
|
|
- $opcConnectName = 'mysql_opc_'.$getMineCode;
|
|
|
-
|
|
|
- $opcDB = DB::connection($opcConnectName);
|
|
|
|
|
|
if (isset($this->localConf[$getMineCode][$getDataType])) {
|
|
|
+
|
|
|
+ $opcConnectName = 'mysql_opc_'.$getMineCode;
|
|
|
+
|
|
|
$groupId = $this->localConf[$getMineCode][$getDataType];
|
|
|
+
|
|
|
$sqlStr = "
|
|
|
select t1.dev_type_id,
|
|
|
t1.dev_type_name,
|
|
@@ -84,6 +85,8 @@ class OpcDataController extends Controller
|
|
|
and t1.is_show = 1
|
|
|
order by t1.dev_type_id, t1.row_number, t1.device_num, t1.device_name
|
|
|
";
|
|
|
+
|
|
|
+ $opcDB = DB::connection($opcConnectName);
|
|
|
$dbResult = $opcDB->select($sqlStr);
|
|
|
// echo($sqlStr);
|
|
|
switch($getDataType) {
|