hehele/hyperf_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat : site

Browse Source
This commit is contained in:
ctexthuang
2024-11-12 15:40:33 +08:00
parent 82dd7450af
commit 900d98234b
7 changed files with 169 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Model/AdminUser.php
View File

@@ -74,4 +74,25 @@ class AdminUser extends Model
{
return $this->where('id', $id)->where('is_del',UserCode::IS_NO_DEL)->first();
}
/**
* 获取所有数据
* @param array $ids
* @return array
*/
public function getDataByIds(array $ids): array
{
$data = $this->whereIn('id',$ids)->get();
if (empty($data)){
return [];
}
$res = [];
foreach ($data->toArray() as $one)
{
$res[$one['id']] = $one;
}
return $res;
}
}

21
app/Model/Kitchen.php
View File

@@ -60,4 +60,25 @@ class Kitchen extends Model
{
return $this->where('id',$id)->where('is_del',SiteCode::KITCHEN_NO_DEL)->first();
}
/**
* 获取所有数据
* @param array $ids
* @return array
*/
public function getDataByIds(array $ids): array
{
$data = $this->whereIn('id',$ids)->get();
if (empty($data)){
return [];
}
$res = [];
foreach ($data->toArray() as $one)
{
$res[$one['id']] = $one;
}
return $res;
}
}

10
app/Model/OssObject.php
View File

@@ -6,6 +6,7 @@ namespace App\Model;
use App\Constants\Common\OssObjectCode;
use Hyperf\Collection\Collection;
use Hyperf\Database\Model\Builder;
use Hyperf\DbConnection\Model\Model;
use function Hyperf\Config\config;
@@ -93,6 +94,15 @@ class OssObject extends Model
return $this->whereIn('id', $ids)->get();
}
/**
* @param int $id
* @return Builder|\Hyperf\Database\Model\Model|null
*/
public function getInfoById(int $id): \Hyperf\Database\Model\Model|Builder|null
{
return $this->where('id', $id)->first();
}
/**
* 根据is_enabled获取传入时间前无效资源id
* @param $time

19
app/Model/Site.php
View File

@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace App\Model;
use App\Constants\Common\SiteCode;
use Hyperf\Database\Model\Builder;
use Hyperf\DbConnection\Model\Model;
/**
@@ -62,4 +63,22 @@ class Site extends Model
->where('is_del',SiteCode::SITE_NO_DEL)
->update(['status' => SiteCode::SITE_DISABLE]);
}
/**
* @param string $name
* @return Builder|\Hyperf\Database\Model\Model|null
*/
public function getInfoByName(string $name): \Hyperf\Database\Model\Model|Builder|null
{
return $this->where('name',$name)->where('is_del',SiteCode::SITE_NO_DEL)->first();
}
/**
* @param int $id
* @return \Hyperf\Database\Model\Model|Builder|null
*/
public function getInfoById(int $id): \Hyperf\Database\Model\Model|Builder|null
{
return $this->where('id',$id)->where('is_del',SiteCode::SITE_NO_DEL)->first();
}
}

21
app/Model/SystemCity.php
View File

@@ -67,4 +67,25 @@ class SystemCity extends Model
{
return $this->whereIn('id',$ids)->pluck('title','id')->toArray();
}
/**
* 获取所有数据
* @param array $ids
* @return array
*/
public function getDataByIds(array $ids): array
{
$data = $this->whereIn('id',$ids)->get();
if (empty($data)){
return [];
}
$res = [];
foreach ($data->toArray() as $one)
{
$res[$one['id']] = $one;
}
return $res;
}
}

67
app/Request/Admin/SiteRequest.php
View File

@@ -24,16 +24,27 @@ class SiteRequest extends FormRequest
return [
'name' => 'required|string',
'city_id' => 'required|integer|exists:system_city,id',
// 'driver_id' => 'required|integer|exists:admin_user,id',
// 'kitchen_id' => 'required|integer|exists:kitchen,id',
'driver_id' => 'required|integer|exists:admin_user,id',
'kitchen_id' => 'required|integer|exists:kitchen,id',
'status' => 'required|integer|in:1,2',
'expected_delivery_time' => 'required|string|date_format:H:i',
'remark' => 'sometimes|string',
'address' => 'required|string',
'lng' => 'required|string',
'lat' => 'required|string',
// 'expected_spend_time' => 'required|string|date_format:i:s',
// 'image_id' => 'sometimes|integer|exists:oss_object,id',
'expected_spend_time' => 'required|string|date_format:i:s',
'image_id' => 'sometimes|integer|exists:oss_object,id',
'id' => 'required|integer|exists:site,id',
'query_create_start_time' => 'sometimes|string|date|',
'query_create_end_time' => 'sometimes|string|date|after:query_create_start_time',
'query_name' => 'sometimes|string',
'query_city_id' =>'sometimes|integer|exists:system_city,id',
'query_status' =>'sometimes|integer|in:1,2',
'query_kitchen_id' =>'sometimes|integer|exists:kitchen,id',
'query_driver_id' =>'sometimes|integer|exists:admin_user,id',
'query_id' => 'sometimes|integer|exists:site,id',
'query_driver_name' =>'sometimes|string',
'query_driver_city_id' => 'sometimes|integer|exists:system_city,id',
];
}
@@ -45,7 +56,53 @@ class SiteRequest extends FormRequest
public function scenes(): array
{
return [
'add' => ['name', 'city_id', 'driver_id', 'kitchen_id', 'status','expected_delivery_time', 'remark', 'address', 'lng', 'lat','expected_spend_time','image_id'],
'add' => [
'name',
'city_id',
'driver_id',
'kitchen_id',
'status',
'expected_delivery_time',
'remark',
'address',
'lng',
'lat',
'expected_spend_time',
'image_id'
],
'edit' => [
'id',
'name',
'city_id',
'driver_id',
'kitchen_id',
'status',
'expected_delivery_time',
'remark',
'address',
'lng',
'lat',
'expected_spend_time',
'image_id'
],
'info' => ['id'],
'del' => ['id'],
'list' => [
'limit',
'query_create_start_time',
'query_create_end_time',
'query_name',
'query_city_id',
'query_status',
'query_kitchen_id',
'query_driver_id',
'query_id',
],
'driver_list' => [
'limit',
'query_driver_name',
'query_driver_city_id',
]
];
}
}

15
app/Service/ServiceTrait/Common/OssTrait.php
View File

@@ -13,6 +13,7 @@ namespace App\Service\ServiceTrait\Common;
use App\Exception\ErrException;
use App\Model\OssObject;
use Hyperf\Di\Annotation\Inject;
use Hyperf\Tappable\HigherOrderTapProxy;
trait OssTrait
{
@@ -85,4 +86,18 @@ trait OssTrait
return $res;
}
/**
* @param int $ossId
* @return HigherOrderTapProxy|mixed|string|null
*/
public function getOssObjectById(int $ossId): mixed
{
$data = $this->ossObjectModel->getInfoById($ossId);
if (empty($data)){
return '';
}
return $data->url ?? '';
}
}