From 483e0fa349622e13eb77f39ff8006ef80ec5f0ab Mon Sep 17 00:00:00 2001 From: dongpd Date: Thu, 10 Dec 2020 17:04:41 +0700 Subject: [PATCH] update config --- controllers/ConfigController.php | 42 ++++++++++- controllers/ListManagementController.php | 25 +++++- db/app.db | Bin 2404352 -> 2404352 bytes models/SyncUrl.php | 7 +- .../yiisoft/yii2-app/layouts/header.php | 2 +- views/config/config.tpl | 13 +++- views/config/device.tpl | 71 ++++++++++++++++++ views/config/index.tpl | 13 +++- web/js/config.js | 31 ++++++++ 9 files changed, 189 insertions(+), 15 deletions(-) create mode 100644 views/config/device.tpl diff --git a/controllers/ConfigController.php b/controllers/ConfigController.php index 2522dd6f..6f3b668f 100644 --- a/controllers/ConfigController.php +++ b/controllers/ConfigController.php @@ -34,7 +34,7 @@ class ConfigController extends Controller { } public $config_json = [ - "lang" => "vi", + "lang" => "vi", "camera" => [ "auto_check" => 1, "num_cam" => 2, @@ -162,7 +162,7 @@ class ConfigController extends Controller { * @return mixed */ public function actionIndex() { - $this->view->title = "Cấu hình thiết bị"; + $this->view->title = "Cấu hình máy chủ"; $options = [ 'http' => [ 'header' => "Content-Type: application/json", @@ -368,4 +368,42 @@ class ConfigController extends Controller { } } + public function actionCauHinhThietBi() { + $this->view->title = "Cấu hình thiết bị"; + return $this->render('device', [ + "server_api" => \app\models\SyncUrl::findOne(['key_config' => 'server_api']), + "device_id" => \app\models\SyncUrl::findOne(['key_config' => 'device_id']) + ]); + } + + public function actionSaveConfig() { + if (Yii::$app->request->post()) { + $post = Yii::$app->request->post(); + $server_api = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); + if ($server_api) { + $server_api->data = $post['server_api']; + $server_api->save(); + } else { + $model = new \app\models\SyncUrl(); + $model->create([ + 'key_config' => 'server_api', + 'data' => $post['server_api'] + ]); + } + + $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); + if ($device_id) { + $device_id->data = $post['device_id']; + $device_id->save(); + } else { + $model = new \app\models\SyncUrl(); + $model->create([ + 'key_config' => 'device_id', + 'data' => $post['device_id'] + ]); + } + return true; + } + } + } diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index 578dbe8c..7cc69312 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -270,12 +270,21 @@ class ListManagementController extends Controller { public function actionSyncFromServer() { if (Yii::$app->request->isAjax) { - $datas = json_decode(file_get_contents("https://dev-dc.beetai.com/api/oem/get_all_image", false, stream_context_create([ + $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); + $ip = "dev-dc.beetai.com"; + if ($server_ip) + $ip = $server_ip->data; + $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); + $id_camera = 209; + if ($device_id) + $id_camera = intval($device_id->data); + + $datas = json_decode(file_get_contents("https://" . $ip . "/api/oem/get_all_image", false, stream_context_create([ 'http' => [ 'header' => "Content-Type: application/json", 'method' => "POST", 'content' => json_encode([ - "id_camera" => 209, + "id_camera" => $id_camera, "ids_staff" => [] ]) ] @@ -293,12 +302,20 @@ class ListManagementController extends Controller { public function actionSyncFeature() { if (Yii::$app->request->post()) { Yii::$app->response->format = "json"; - $res = json_decode(file_get_contents("https://dev-dc.beetai.com/api/oem/get_all_image", false, stream_context_create([ + $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); + $ip = "dev-dc.beetai.com"; + if ($server_ip) + $ip = $server_ip->data; + $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); + $id_camera = 209; + if ($device_id) + $id_camera = intval($device_id->data); + $res = json_decode(file_get_contents("https://" . $ip . "/api/oem/get_all_image", false, stream_context_create([ 'http' => [ 'header' => "Content-Type: application/json", 'method' => "POST", 'content' => json_encode([ - "id_camera" => 209, + "id_camera" => $id_camera, "ids_staff" => [strval(Yii::$app->request->post("id"))] ]) ] diff --git a/db/app.db b/db/app.db index 5292374ba156a3ac348619e5cec97299be3c2785..e054814e1b7b449a06bdc04ae2e4c38bda6bc3be 100644 GIT binary patch delta 606 zcmZY4F>Df17zgn8xH~xDxCa7-S}1TD6C32PYK1fmCN&PGk)Z>L!{y)(auG@eY{H^o zV!CKzh2%ElR%2qC+JQ9AO`IJZTxik`9UMA2s(+eR2lMjFd+&SieJ}ss!5i9x*E4|v zA&&cmPzUBkLdfsU^bMgvGB=Yu#@j^nhzM*bu+Qup`@n|m3wz4;G5WiK;sZ9Y)M#)@ zY(K7-wT{_X(>i*&Zfe&DLv>y`B2u1<({^{YqCIKVc`3^!#HwB~wR*GG#!s=`V|DtS zm;E3Pwnx|=`;Mj`*}VkEla$&vTkB>^)7LD+T)$>iGG){3=vJoEZ1{PeB!VbgXl5Dn z**v<1QsIA3sz$r|>A+E(Q-~~V3G!FD=j+LLB-6L-?MYWWTi#{&LubLYjl-8*m#PXKm<2-mg#;ua1qxgmokTDD?LTzSy7vG8 delta 441 zcmXBOyGtWs6b10_W}H_Z^JP|J#z&0CMKFqq${0n0h**gzm?B^iqDEPWm|e5jx#Nmh z`bgmG#7?l0kRph6{s9ZI5d|$QwN(U<$mPf3z$vcta7+#ywwX3#t{KM2g&b#$y&v@t z%QhRBxUH<5gsnQ0dD+FU_!Gb3=e*3fc^$V?HRtDe=~v8ZjB1;|^GlgxZoQBxW|#80 z%y6k38;ZO#Q(w*&ihuv)GWm_QO>bNZYpdDi@8;>3Le=M3%W0KPRex1`c$ 'ID', 'data' => 'Data', + 'key_config' => 'Key Config' ]; } public function create($data) { $r = $this->load([ - 'data' => $data['url'], + 'key_config' => $data['key_config'], + 'data' => $data['data'], ], ''); if ($r) { try { diff --git a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php index 65b2b99b..c52e5cfc 100644 --- a/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php +++ b/vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php @@ -37,7 +37,7 @@ use yii\widgets\ActiveForm;