Merge branch 'develop' into feature/mzl_dev

2025-10-11 16:50:14 +08:00
parent 009312ffa3 a1d74c1cc5
commit ddb4e5a484
15 changed files with 902 additions and 13 deletions
@@ -0,0 +1,90 @@
+<?php
+namespace app\common\controller;
+
+use app\common\controller\BaseController;
+use app\common\service\OssService;
+use app\common\traits\crud\CrudControllerTrait;
+use app\admin\service\BrandService;
+use support\Request;
+
+class BrandController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new BrandService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+     protected function indexFormat($data)
+     {
+         if (isset($data['created_at']))
+             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+         if (isset($data['updated_at']))
+             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         if (!empty($data['logo']))
+             $data['logo_full'] = (new OssService)->generatePrivateUrl($data['logo']);
+         return $data;
+     }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        if (empty($data['logo']))
+            $data['logo_full'] = (new OssService)->generatePrivateUrl($data['logo']);
+        return $data;
+    }
+
+    /**
+     * 抓取品牌系列
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function crawlSeries(Request $request){
+        try {
+            $result = $this->service->crawlSeries($request);
+            if($result){
+                return $this->success($result,'成功');
+            }else{
+                return $this->error('抓取任务提交失败');
+            }
+        } catch (\Exception $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 创建被抓取且选中的品牌系列
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function crawlSeriesCreate(Request $request){
+        try {
+            $result = $this->service->crawlSeriesCreate($request);
+            if($result){
+                return $this->success([],$result);
+            }else{
+                return $this->error('创建失败');
+            }
+        } catch (\Exception $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+}
@@ -0,0 +1,85 @@
+<?php
+namespace app\common\controller;
+
+use app\common\controller\BaseController;
+use app\common\traits\crud\CrudControllerTrait;
+use app\admin\service\BrandSeriesService;
+use support\Request;
+
+class BrandSeriesController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new BrandSeriesService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+     protected function indexFormat($data)
+     {
+         if (isset($data['created_at']))
+             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+         if (isset($data['updated_at']))
+             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         return $data;
+     }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        return $data;
+    }
+
+    /**
+     * 异步抓取系列车型
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function crawlModels(Request $request){
+        try {
+            $result = $this->service->crawlModel($request);
+            if($result){
+                return $this->success($result,'抓取成功');
+            }else{
+                return $this->error('抓取任务提交失败');
+            }
+        } catch (\Exception $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+    /**
+     * 异步抓取系列车型
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function crawlModelCreate(Request $request){
+        try {
+            $result = $this->service->crawlModelCreate($request);
+            if($result){
+                return $this->success($result,'成功');
+            }else{
+                return $this->error('创建失败');
+            }
+        } catch (\Exception $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+}
@@ -0,0 +1,53 @@
+<?php
+namespace app\common\controller;
+
+use app\common\controller\BaseController;
+use app\common\model\Country;
+use app\common\traits\crud\CrudControllerTrait;
+use app\admin\service\SysPortService;
+
+class SysPortController extends BaseController
+{
+    use CrudControllerTrait;
+
+    protected $service;
+
+    public function __construct()
+    {
+        $this->service = new SysPortService();
+    }
+
+    /**
+     * 列表页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+     protected function indexFormat($data)
+     {
+         if (isset($data['created_at']))
+             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+         if (isset($data['updated_at']))
+             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         if (isset($data['country_id']))
+         if (isset($data['country_id']))
+            $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr');
+         return $data;
+     }
+
+    /**
+     * 数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function showFormat($data)
+    {
+        if (isset($data['created_at']))
+            $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+        if (isset($data['updated_at']))
+            $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+        $data['country_name'] = Country::where('id', $data['country_id'])->value('cn_addr');
+        return $data;
+    }
+}
@@ -170,6 +170,8 @@ class UploadController
                'original_name' => $file->getUploadName(),
            ];

+            $partition = !empty($partition)?$partition:'other';
+            $category = !empty($category)?$category:'other';
            $recordResult = $uploadedFilesService->recordFileInfo($fileInfo, $request, $partition, $category);
            $data = [];
            $data['file_id'] = $recordResult['id'];
@@ -2,6 +2,8 @@
 namespace app\common\controller;

 use app\common\controller\BaseController;
+use app\common\model\BrandSeries;
+use app\common\service\VehModificationService;
 use app\common\traits\crud\CrudControllerTrait;
 use app\common\service\VehVehicleSkuService;
 use support\exception\BusinessException;
@@ -89,6 +91,22 @@ class VehVehicleSkuController extends BaseController
        }
    }

+    public function preset(Request $request){
+
+
+        try {
+            $series_id = $request->input('series_id');
+            $series_code = BrandSeries::where('id', $series_id)->value('series_code');
+            $data = [
+                'series_code' => $series_code,
+            ];
+            $result = $this->service->getList($data);
+            return $this->success($result, '获取车型列表');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+

    public function fields_desc(Request $request)
    {