|
@@ -1118,6 +1118,50 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
// 对传入的 page_type 数组进行去重、转换为整数并重新索引
|
|
|
$data['page_type'] = array_values(array_unique(array_map('intval', $data['page_type'])));
|
|
|
$data['page_type'] = json_encode($data['page_type']);
|
|
|
+ if($data['component_num'] == 1){
|
|
|
+ $component_arr[0] = [
|
|
|
+ 'size_id' => $data['size_id'],
|
|
|
+ ];
|
|
|
+ }else{
|
|
|
+ $size = SectorPlace::where('type',$data['place_type'])
|
|
|
+ ->leftJoin('size','size.id','=','sector_place.size_id')
|
|
|
+ ->select('sector_place.*','size.width','size.height')
|
|
|
+ ->orderBy('sector_place.sort_id','asc')
|
|
|
+ ->get()->all();
|
|
|
+ if(!empty($size)){
|
|
|
+ for ($i=0; $i < $data['component_num']; $i++) {
|
|
|
+ $component_arr[$i] = [
|
|
|
+ 'size_id' => $size[$i]['size_id'],
|
|
|
+ 'width' => $size[$i]['width'],
|
|
|
+ 'height' => $size[$i]['height'],
|
|
|
+ 'sort' => $size[$i]['sort_id'],
|
|
|
+ 'place_name' => $size[$i]['name'],
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // $code_arr
|
|
|
+
|
|
|
+ }
|
|
|
+ if($data['sector_type'] == 2 || $data['sector_type'] == 3){
|
|
|
+ $sector_code = [
|
|
|
+ 'sectorName' => $data['sector_name'],
|
|
|
+ 'sectorId' => $data['sector_id'],
|
|
|
+ 'sectorType' => $data['sector_type'],
|
|
|
+ 'sectorPlace' => $data['place_type'],
|
|
|
+ 'compnentList' => $component_arr,
|
|
|
+ 'ad' => [],
|
|
|
+ ];
|
|
|
+ }else{
|
|
|
+ $sector_code = [
|
|
|
+ 'sectorName' => $data['sector_name'],
|
|
|
+ 'sectorId' => $data['sector_id'],
|
|
|
+ 'sectorType' => $data['sector_type'],
|
|
|
+ 'sectorPlace' => $data['place_type'],
|
|
|
+ 'compnentList' => $component_arr,
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ // return Result::success($sector_code);
|
|
|
+ $data['sector_code'] = json_encode($sector_code);
|
|
|
$template = Template::where('template_id', $data['template_id'])
|
|
|
->whereRaw("JSON_CONTAINS(template.page_type, ?)", [$data['page_type']])
|
|
|
->first();
|
|
@@ -1170,6 +1214,51 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
return Result::error('通栏编号已存在!');
|
|
|
}
|
|
|
}
|
|
|
+ if($data['component_num'] == 1){
|
|
|
+ $component_arr[0] = [
|
|
|
+ 'size_id' => $data['size_id'],
|
|
|
+ ];
|
|
|
+ }else{
|
|
|
+ $size = SectorPlace::where('type',$data['place_type'])
|
|
|
+ ->leftJoin('size','size.id','=','sector_place.size_id')
|
|
|
+ ->select('sector_place.*','size.width','size.height')
|
|
|
+ ->orderBy('sector_place.sort_id','asc')
|
|
|
+ ->get()->all();
|
|
|
+ if(!empty($size)){
|
|
|
+ for ($i=0; $i < $data['component_num']; $i++) {
|
|
|
+ $component_arr[$i] = [
|
|
|
+ 'size_id' => intval($size[$i]['size_id']),
|
|
|
+ 'width' => intval($size[$i]['width']),
|
|
|
+ 'height' => intval($size[$i]['height']),
|
|
|
+ 'sort' => intval($size[$i]['sort_id']),
|
|
|
+ 'place_name' => strval($size[$i]['name']),
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // $code_arr
|
|
|
+
|
|
|
+ }
|
|
|
+ if($data['sector_type'] == 2 || $data['sector_type'] == 3){
|
|
|
+ $sector_code = [
|
|
|
+ 'sectorName' => strval($data['sector_name']),
|
|
|
+ 'sectorId' => intval($data['sector_id']),
|
|
|
+ 'sectorType' => intval($data['sector_type']),
|
|
|
+ 'sectorPlace' => intval($data['place_type']),
|
|
|
+ 'compnentList' => $component_arr,
|
|
|
+ 'ad' => [],
|
|
|
+ ];
|
|
|
+ }else{
|
|
|
+ $sector_code = [
|
|
|
+ 'sectorName' => strval($data['sector_name']),
|
|
|
+
|
|
|
+ 'sectorId' => intval($data['sector_id']),
|
|
|
+ 'sectorType' => intval($data['sector_type']),
|
|
|
+ 'sectorPlace' => intval($data['place_type']),
|
|
|
+ 'compnentList' => $component_arr,
|
|
|
+ ];
|
|
|
+ }
|
|
|
+ // return Result::success($sector_code);
|
|
|
+ $data['sector_code'] = json_encode($sector_code);
|
|
|
// 对传入的 page_type 数组进行去重、转换为整数并重新索引
|
|
|
$data['page_type'] = array_values(array_unique(array_map('intval', $data['page_type'])));
|
|
|
$data['page_type'] = json_encode($data['page_type']);
|