Browse Source

返回楼层图片完整路径3

master
wanghongjun 4 days ago
parent
commit
197eda7a44
  1. 27
      app/Http/Controllers/Admin/FloorController.php
  2. 32
      app/Services/AdminFloorService.php

27
app/Http/Controllers/Admin/FloorController.php

@ -135,10 +135,7 @@ class FloorController extends BaseController
$this->validateId($id, AdminFloor::class);
$data = [
'region_list' => AdminFloorRegion::getFloorRegion($id),
'item' => AdminFloor::query()
->where('id', $id)
->get()
->toArray()
'item' => AdminFloorService::getFloorData($id)
];
return $this->responseService->success($data);
} catch (Exception $e) {
@ -235,4 +232,26 @@ class FloorController extends BaseController
);
}
}
/**
* 楼层编号查询区域
* @param Request $request
* @return JsonResponse
*/
public function floorRegionList(Request $request): JsonResponse
{
try {
$floor_id = $request->get('floor_id', '');
$this->validateId($floor_id, AdminFloor::class);
$data = [
'floor_region_list' => AdminFloorRegion::getFloorRegion($floor_id)
];
return $this->responseService->success($data);
} catch (Exception $e) {
$m_prefix = __('exception.exception_handler.resource');
return $this->responseService->systemError(
$m_prefix . ':' . $e->getMessage()
);
}
}
}

32
app/Services/AdminFloorService.php

@ -178,22 +178,38 @@ class AdminFloorService
}
// 获取楼层列表
public static function getSelectList($building_floor): array
public static function getSelectList($building_floor, $column = []): array
{
$column = [
'id as floor_id',
'name as floor_name',
'image_url as pic_url',
'building_floor'
];
if (empty($column)) {
$column = [
'id as floor_id',
'name as floor_name',
'image_url as pic_url',
'building_floor'
];
}
$list = AdminFloor::query()->where('building_floor', $building_floor)->whereNull('deleted_at')->select($column)
->get()->toArray();
foreach ($list as &$item) {
$item['pic_url'] = env('app_url') . $item['pic_url'];
if (isset($item['pic_url'])) {
$item['pic_url'] = env('app_url') . $item['pic_url'];
}
}
return $list;
}
// 获取单个楼层信息
public static function getFloorData($id): array
{
$data = AdminFloor::query()->where('id', $id)->get()->toArray();
foreach ($data as &$item) {
if (isset($item['image_url'])) {
$item['pic_url'] = env('app_url') . $item['image_url'];
}
}
return $data;
}
// 获取楼栋层
public static function getBuildingFloor(): array
{

Loading…
Cancel
Save