update save serverKey, staff_id

This commit is contained in:
dongpd 2021-06-03 09:46:52 +07:00
parent 9ceb3567c9
commit 08266f3a5f
8 changed files with 160 additions and 118 deletions

View File

@ -150,6 +150,7 @@ class ListManagementController extends Controller {
];
$listManagement->type = $data['type'];
$listManagement->name = $data['name'];
$listManagement->abbreviated_name = $data['abbreviated_name'];
$listManagement->gender = $data['gender'];
$listManagement->birthday = $data['birthday'] === "" ? 0 : date_format(date_create_from_format('d/m/Y', $data['birthday']), 'U');
$listManagement->telephone = $data['telephone'];
@ -206,6 +207,7 @@ class ListManagementController extends Controller {
"type" => $ListManagement->type,
"code" => $ListManagement->code,
"name" => $ListManagement->name,
"abbreviated_name" => $ListManagement->abbreviated_name,
"gender" => $ListManagement->gender,
"birthday" => date("d/m/Y", $ListManagement->birthday),
"telephone" => $ListManagement->telephone,
@ -250,6 +252,7 @@ class ListManagementController extends Controller {
$model->code = $data['code'];
$model->type = $data['type'];
$model->name = $data['name'];
$model->abbreviated_name = $data['abbreviated_name'];
$model->gender = $data['gender'];
$model->birthday = $data['birthday'] === "" ? 0 : date_format(date_create_from_format('d/m/Y', $data['birthday']), 'U');
$model->telephone = $data['telephone'];
@ -440,107 +443,101 @@ class ListManagementController extends Controller {
return $time[1] + $time[0];
}
public function extractFeature($images, $staff_id) {
$extractFeature = [];
$ft = [];
foreach ($images as $key => $value) {
if ($key < Yii::$app->params['maxPicture']) {
$fileName = "face_" . $staff_id . "_" . common::generateRandomString() . "_" . time() . ".png";
$start = $this->getCurrentTime();
$img = false;
try {
$img = file_get_contents(str_replace("&amp;", "&", $value));
} catch (\Exception $e) {
}
$finish = $this->getCurrentTime();
$temp["getIMG"] = round(($finish - $start), 4);
if ($img && $img !== "null") {
$fileTarget = $targetPath . "/" . $fileName;
$start = $this->getCurrentTime();
if (!$this->resizeImg($img, $fileTarget)) {
file_put_contents($fileTarget, $img);
}
$finish = $this->getCurrentTime();
$temp["saveIMG"] = round(($finish - $start), 4);
$start = $this->getCurrentTime();
$features = json_decode(common::requestToEngine("/get-feature", [
"image_paths" => [
["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"]
],
"type" => "128"
]), true);
$finish = $this->getCurrentTime();
$temp["extract"] = round(($finish - $start), 4);
$ft[] = [
"url" => $fileName,
"urlOld" => $fileName,
"features" => $features['results'][0]['feature'],
"features512" => []//isset($features['results'][0]['feature512']) ? $features['results'][0]['feature512'] : []
];
}
$extractFeature[] = $temp;
}
}
return [
"time" => $extractFeature,
"features" => $ft
];
}
public function actionSyncFeature() {
if (Yii::$app->request->post()) {
Yii::$app->response->format = "json";
$processTime = [];
$totalStart = $this->getCurrentTime();
$totals = intval(Yii::$app->request->post("totals"));
// $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']);
// $ip = "https://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);
// $start = $this->getCurrentTime();
// $res = json_decode(file_get_contents($ip . "/api/oem/get_all_image", false, stream_context_create([
// 'http' => [
// 'header' => "Content-Type: application/json",
// 'method' => "POST",
// 'content' => json_encode([
// "id_camera" => $id_camera,
// "ids_staff" => [strval(Yii::$app->request->post("id"))]
// ])
// ]
// ])), true);
// $finish = $this->getCurrentTime();
// $processTime["requestToAPI"] = round(($finish - $start), 4);
$data = Yii::$app->request->post("id"); //$res['data'][0];
$ft = [];
$RootFolder = Yii::getAlias('@webroot') . "/data/uploads";
$targetPath = $RootFolder . "/face";
FileHelper::createDirectory($targetPath, 0777);
$extractFeature = [];
if (isset($data['images'])) {
foreach ($data['images'] as $key => $value) {
if ($key < Yii::$app->params['maxPicture']) {
$fileName = "face_" . common::generateRandomString() . "_" . time() . ".png";
$start = $this->getCurrentTime();
$img = false;
try {
$img = file_get_contents(str_replace("&amp;", "&", $value));
// $img = file_get_contents($value);
} catch (\Exception $e) {
}
$finish = $this->getCurrentTime();
$temp["getIMG"] = round(($finish - $start), 4);
if ($img && $img !== "null") {
$fileTarget = $targetPath . "/" . $fileName;
$start = $this->getCurrentTime();
if (!$this->resizeImg($img, $fileTarget)) {
file_put_contents($fileTarget, $img);
}
$finish = $this->getCurrentTime();
$temp["saveIMG"] = round(($finish - $start), 4);
$start = $this->getCurrentTime();
$features = json_decode(common::requestToEngine("/get-feature", [
"image_paths" => [
["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"]
],
"type" => "128"
]), true);
$finish = $this->getCurrentTime();
$temp["extract"] = round(($finish - $start), 4);
$ft[] = [
"url" => $fileName,
"urlOld" => $fileName,
"features" => $features['results'][0]['feature'],
"features512" => []//isset($features['results'][0]['feature512']) ? $features['results'][0]['feature512'] : []
];
}
$extractFeature[] = $temp;
}
}
}
$processTime["extractFeature"] = $extractFeature;
$start = $this->getCurrentTime();
$model = ListManagement::findOne(['code' => $data['idStaff']]);
$model = ListManagement::findOne(['staff_id' => $data['id']]);
$finish = $this->getCurrentTime();
$processTime["getLM"] = round(($finish - $start), 4);
if ($model) {
$model->abbreviated_name = $data['abbreviated_name'];
$model->code = $data['code'];
$model->name = $data['name'];
$model->address = $data['department'];
$model->image = json_encode($ft);
// $model->image = json_encode($ft);
$model->last_modified = time();
$model->save();
if ($totals <= 10)
common::updateFeature([
"cmd" => "update",
"id" => $model->id,
"name" => common::convert_vi_to_en($model->name),
"features" => $model->allFeatures
]);
// if ($totals <= 10)
// common::updateFeature([
// "cmd" => "update",
// "id" => $model->id,
// "name" => common::convert_vi_to_en($model->name),
// "features" => $model->allFeatures
// ]);
} else {
$ft = [];
if (isset($data['images'])) {
$extractFeature = $this->extractFeature($data['images'], $data['id']);
$processTime["extractFeature"] = $extractFeature['time'];
$ft = $extractFeature['features'];
}
$start = $this->getCurrentTime();
$model = new ListManagement();
$model->create([
'code' => strval($data['idStaff']),
'code' => strval($data['code']),
'type' => "wl",
'name' => $data['name'],
'abbreviated_name' => $data['abbreviated_name'],
'staff_id' => $data['id'],
'image' => json_encode($ft),
'gender' => "Male",
'birthday' => "",
@ -549,17 +546,17 @@ class ListManagementController extends Controller {
]);
$finish = $this->getCurrentTime();
$processTime["insertDB"] = round(($finish - $start), 4);
if ($totals <= 10)
common::updateFeature([
"cmd" => "create",
"id" => $model->id,
"name" => common::convert_vi_to_en($model->name),
"features" => $model->allFeatures
]);
// if ($totals <= 10)
// common::updateFeature([
// "cmd" => "create",
// "id" => $model->id,
// "name" => common::convert_vi_to_en($model->name),
// "features" => $model->allFeatures
// ]);
}
$totalFinish = $this->getCurrentTime();
$processTime["total"] = round(($totalFinish - $totalStart), 4);
$processTime["id"] = strval($data['idStaff']);
$processTime["id"] = strval($data['code']);
return $processTime; //["status" => true];
}
}
@ -656,7 +653,8 @@ class ListManagementController extends Controller {
"gender" => $staff->gender,
"birthday" => date("d/m/Y", $staff->birthday),
"telephone" => $staff->telephone,
"department" => $staff->address
"department" => $staff->address,
"abbreviated_name" => $staff->abbreviated_name
];
}
}
@ -695,14 +693,21 @@ class ListManagementController extends Controller {
$lsImgs = json_decode($StaffInfo->image, true);
$images = [];
foreach ($lsImgs as $key => $value) {
try {
$images[] = base64_encode(file_get_contents("/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $value['url']));
} catch (\Exception $e) {
if (!isset($value['serverKey']) || (isset($value['serverKey']) && $value['serverKey'] == "")) {
try {
$images[] = base64_encode(file_get_contents("/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $value['url']));
} catch (\Exception $e) {
}
}
}
if (count($images) == 0)
return ["status" => true, "text" => "Dữ liệu không đổi"];
$items = [
"id" => $StaffInfo->staff_id,
"name" => $StaffInfo->name,
"abbreviated_name" => $StaffInfo->abbreviated_name,
"code" => $StaffInfo->code,
"department" => $StaffInfo->address,
"birthday" => date("Y-m-d", $StaffInfo->birthday),
@ -722,6 +727,14 @@ class ListManagementController extends Controller {
])
]
])), true);
if ($res['status'] == 10000) {
$resData = $res['data'];
for ($i = 0; $i < count($lsImgs); $i++) {
$lsImgs[$i]['serverKey'] = isset($resData[$i]) ? $resData[$i] : "";
}
$StaffInfo->image = json_encode($lsImgs);
$StaffInfo->save();
}
} catch (\Exception $e) {
}

BIN
db/app.db

Binary file not shown.

View File

@ -8,9 +8,11 @@ use Yii;
* This is the model class for table "list_management".
*
* @property int $id
* @property string $staff_id
* @property string $code
* @property string $type
* @property string $name
* @property string $abbreviated_name
* @property string $image
* @property string $gender
* @property int $birthday
@ -33,7 +35,7 @@ class ListManagement extends \yii\db\ActiveRecord {
*/
public function rules() {
return [
[['type', 'name', 'gender', 'telephone', 'address', 'image', 'code'], 'string'],
[['type', 'name', 'gender', 'telephone', 'address', 'image', 'code', 'abbreviated_name', 'staff_id'], 'string'],
[['birthday', 'time', 'last_modified'], 'integer'],
];
}
@ -53,12 +55,15 @@ class ListManagement extends \yii\db\ActiveRecord {
'telephone' => 'Điện thoại',
'address' => 'Đơn vị',
'time' => 'Thời gian đăng kí',
'last_modified' => 'Last Modified'
'last_modified' => 'Last Modified',
'abbreviated_name' => 'Tên hiển thị',
'staff_id' => 'ID'
];
}
public function create($data) {
$r = $this->load([
'staff_id' => $data['staff_id'],
'code' => $data['code'],
'type' => $data['type'],
'name' => $data['name'],
@ -67,6 +72,7 @@ class ListManagement extends \yii\db\ActiveRecord {
'birthday' => $data['birthday'] === "" ? 0 : date_format(date_create_from_format('d/m/Y', $data['birthday']), 'U'),
'telephone' => $data['telephone'],
'address' => $data['address'],
'abbreviated_name' => $data['abbreviated_name'],
'time' => time(),
'last_modified' => time()
], '');
@ -102,7 +108,7 @@ class ListManagement extends \yii\db\ActiveRecord {
$res = [];
$ls = self::find()->all();
foreach ($ls as $key => $value) {
$res[] = $value->code;
$res[] = $value->staff_id;
}
return $res;
}

View File

@ -128,6 +128,12 @@
<input type="text" name="Name">
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Tên hiển thị</div>
<div class="col-md-8">
<input type="text" name="AbbreviatedName">
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Giới tính</div>
<div class="col-md-8">

View File

@ -66,7 +66,10 @@
],
[
'attribute' => 'name',
'contentOptions' => ['class' => 'text-center'],
'headerOptions' => ['class' => 'text-center']
],
[
'attribute' => 'abbreviated_name',
'headerOptions' => ['class' => 'text-center']
],
[
@ -86,12 +89,6 @@
'headerOptions' => ['class' => 'text-center'],
'value' => \app\helpers\ListManagementGrid::time()
],
[
'attribute' => 'birthday',
'contentOptions' => ['class' => 'text-center'],
'headerOptions' => ['class' => 'text-center'],
'value' => \app\helpers\ListManagementGrid::birthday()
],
[
'attribute' => 'telephone',
'contentOptions' => ['class' => 'text-center'],
@ -218,22 +215,22 @@
</table>
</div>
</div>
<div style="width: 300px;position: absolute;" id="menu" class="hidden">
<div style="width: 200px;position: absolute;" id="menu" class="hidden">
<div class="panel panel-info">
<div class="panel-heading text-bold">
Operation menu
Thao tác
<i class="fa fa-remove pull-right" style="cursor: pointer;" onclick="_closeMenu();"></i>
</div>
<div class="panel-body text-center">
<button onclick="_formModified(this);" data-href='{Url::to(["/list-management/form-update"])}'>Modified list</button>
<button onclick="_delete(this);" data-href="{Url::to(["/list-management/delete"])}">Delete list</button>
<button onclick="_formModified(this);" data-href='{Url::to(["/list-management/form-update"])}'>Sửa</button>
<button onclick="_delete(this);" data-href="{Url::to(["/list-management/delete"])}">Xóa</button>
</div>
</div>
</div>
<div style="width: 500px;position: absolute;right:0;top: 250px;" id='form' class="hidden">
<div class="panel panel-info">
<div class="panel-heading text-bold">
List management
Quản lý mẫu
<i class="fa fa-remove pull-right" style="cursor: pointer;" onclick="_close();"></i>
</div>
<div class="panel-body">
@ -248,7 +245,7 @@
</div>
<div class="col-md-8">
<div class="row">
<div class="col-md-4 text-right">Type</div>
<div class="col-md-4 text-right">Danh sách</div>
<div class="col-md-8">
<select style="width: 100%;height: 26px;" name="Type">
{html_options options=$typeArray}
@ -265,13 +262,19 @@
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Name</div>
<div class="col-md-4 text-right">Tên</div>
<div class="col-md-8">
<input type="text" name="Name">
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Gender</div>
<div class="col-md-4 text-right">Tên hiển thị</div>
<div class="col-md-8">
<input type="text" name="AbbreviatedName">
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Giới tính</div>
<div class="col-md-8">
<select style="width: 100%;height: 26px;" name="Gender">
{html_options options=$genderArray}
@ -279,19 +282,19 @@
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Birthday</div>
<div class="col-md-4 text-right">Ngày sinh</div>
<div class="col-md-8">
<input type="text" name="Birthday" id="birthday">
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Telephone</div>
<div class="col-md-4 text-right">Điện thoại</div>
<div class="col-md-8">
<input type="text" name="Telephone">
</div>
</div>
<div class="row">
<div class="col-md-4 text-right">Department</div>
<div class="col-md-4 text-right">Đơn vị</div>
<div class="col-md-8">
<input type="text" name="Address">
</div>
@ -300,8 +303,8 @@
</div>
<div class="text-center">
<input type="hidden" value="" name="ListManagementID">
<button onclick="_update(this);" data-href='{Url::to(["/list-management/update"])}' id="save-btn">Save</button>
<button onclick="_close();">Cancel</button>
<button onclick="_update(this);" data-href='{Url::to(["/list-management/update"])}' id="save-btn">Lưu</button>
<button onclick="_close();">Hủy</button>
</div>
</div>
</div>

View File

@ -22,23 +22,24 @@
<tr>
<th>ID</th>
<th>Tên</th>
<th>Tên hiển thị</th>
<th>Đơn vị</th>
<th>Hình ảnh đăng kí</th>
<th>Code</th>
<th>Company ID</th>
</tr>
</thead>
<tbody id="sync-lists">
{foreach from=$datas item=arr}
<tr id="filters-{$arr.code}" onclick="choooseToSync(this);" style="cursor: pointer;" class="filters {if !in_array($arr.idStaff,$allID)}not-in-list{/if}" data-stt="false" data-id="{trim($arr.idStaff)}">
<tr id="filters-{$arr.id}" onclick="choooseToSync(this);" style="cursor: pointer;" class="filters {if !in_array($arr.id,$allID)}not-in-list{/if}" data-stt="false" data-id="{trim($arr.id)}">
<td>
<div id="full-data-{trim($arr.idStaff)}" class="hidden">{json_encode($arr)}</div>
{$arr.idStaff}
{if in_array($arr.idStaff,$allID)}
<div id="full-data-{trim($arr.id)}" class="hidden">{json_encode($arr)}</div>
{$arr.code}
{if in_array($arr.id,$allID)}
<i class="fa fa-check-circle text-green"></i>
{/if}
</td>
<td>{$arr.name}</td>
<td>{$arr.abbreviated_name}</td>
<td>{$arr.department}</td>
<td>
{foreach from=$arr.images item=img key=k}
@ -49,7 +50,6 @@
{/if}
{/foreach}
</td>
<td>{$arr.code}</td>
<td>{$arr.id_company}</td>
</tr>
{/foreach}

View File

@ -43,6 +43,11 @@ function _save(e) {
alert("Hãy nhập tên!");
return;
}
var abbreviated_name = $("input[name='AbbreviatedName']").val();
if (abbreviated_name === "") {
alert("Hãy nhập tên hiển thị!");
return;
}
common.modalBlock(true);
$.ajax({
url: $(e).attr("data-href"),
@ -50,6 +55,7 @@ function _save(e) {
data: {
code: code,
name: name,
abbreviated_name: abbreviated_name,
type: $("select[name='Type']").val(),
gender: $("select[name='Gender']").val(),
birthday: $("input[name='Birthday']").val(),
@ -84,6 +90,7 @@ function chooseStaff(e) {
success: function (data) {
common.modalBlock(false);
$("input[name='Name']").val(data.name);
$("input[name='AbbreviatedName']").val(data.abbreviated_name);
$("select[name='Gender']").val(data.gender);
$("input[name='Birthday']").val(data.birthday);
$("input[name='Telephone']").val(data.telephone);

View File

@ -68,6 +68,7 @@ function _formModified(e) {
$("select[name='Type']").val(data.type);
$("select[name='Code']").val(data.code);
$("input[name='Name']").val(data.name);
$("input[name='AbbreviatedName']").val(data.abbreviated_name);
$("select[name='Gender']").val(data.gender);
$("input[name='Birthday']").val(data.birthday);
$("input[name='Telephone']").val(data.telephone);
@ -94,6 +95,11 @@ function _update(e) {
alert("Hãy nhập tên!");
return;
}
var abbreviated_name = $("input[name='AbbreviatedName']").val();
if (abbreviated_name === "") {
alert("Hãy nhập tên hiển thị!");
return;
}
common.modalBlock(true);
$.ajax({
url: $(e).attr("data-href"),
@ -101,6 +107,7 @@ function _update(e) {
data: {
code: code,
name: name,
abbreviated_name: abbreviated_name,
type: $("select[name='Type']").val(),
gender: $("select[name='Gender']").val(),
birthday: $("input[name='Birthday']").val(),