xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source
This commit is contained in:
mzl
2025-10-11 16:50:14 +08:00
parent 009312ffa3 a1d74c1cc5
commit ddb4e5a484
15 changed files with 902 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/BrandSeriesService.php
+241 -4
View File
@@ -3,10 +3,20 @@
namespace app\admin\service;
use app\admin\validate\BrandSeriesValidate;
use app\common\logic\Fingerprint;
use app\common\logic\ModelNaming;
use app\common\logic\SkuCodeBuilder;
use app\common\model\Brand;
use app\common\model\VehVehicleSku;
use app\common\service\CrawlService;
use app\common\service\VehVehicleSkuService;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\BrandSeries;
use app\common\utils\CrudUtil;
use GuzzleHttp\Client;
use support\Log;
use support\Request;
use Webman\RedisQueue\Redis;
class BrandSeriesService
{
@@ -28,7 +38,7 @@ class BrandSeriesService
*/
public function getValidator()
{
return new $this->validator;
return new $this->validator;
}
/**
@@ -50,13 +60,13 @@ class BrandSeriesService
// ====== ====== 筛选 ====== ======
$config['where']['brand_id'] = $p['brand_id'];
// 状态
if (isset($p['status']) && in_array($p['status'], [0,1])) {
if (isset($p['status']) && in_array($p['status'], [0, 1])) {
$config['where']['status'] = $p['status'];
}
// 关键字
if (isset($p['keyword']) && $p['keyword']) {
$k = '%' . $p['keyword'] . '%';
foreach (['series_code','series_name'] as $col) {
foreach (['series_code', 'series_name'] as $col) {
$config['orWhere'][] = [$col, 'like', $k];
}
}
@@ -92,7 +102,7 @@ class BrandSeriesService
$maxAttempts = 10; // 防止无限循环
$brand_code = Brand::where('id', $brand_id)->value('brand_code');
$brand_code = $brand_code??'BS';
$brand_code = $brand_code ?? 'BS';
for ($attempt = 0; $attempt < $maxAttempts; $attempt++) {
// 生成后5位随机字符
$suffix = '';
@@ -123,4 +133,231 @@ class BrandSeriesService
$data['series_code'] = $this->generateUniqueModificationCode($brand_id);
return $data;
}
/**
* 抓取车型数据（通过接口）
* @param Request $request
* @return array
* @throws \Exception
*/
public function crawlModel(Request $request): array
{
$series_id = $request->get('brand_series_id');
// 验证品牌是否存在
$series = BrandSeries::where('id', $series_id)->first();
if (!$series) {
throw new \Exception("系列ID {$series_id} 不存在");
}
// 获取品牌信息
$series = BrandSeries::where('id', $series_id)->first();
if (!$series) {
throw new \Exception("系列ID {$series_id} 不存在");
}
// 获取品牌信息
$brand = Brand::where('id', $series->brand_id)->first();
// 执行抓取
$crawlService = new CrawlService();
$href = $crawlService->modelSearch($brand->brand_name . ' ' . $series->series_name);
$seriesId = $this->extractSeriesId($href);
$client = new Client([
'verify' => false, // 禁用 SSL 验证
'timeout' => 10
]);
try {
$response = $client->get('https://www.dongchedi.com/motor/pc/car/series/car_list', [
'query' => ['series_id' => $seriesId],
'headers' => [
'User-Agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
]
]);
$data = json_decode($response->getBody()->getContents(), true);
if($data['status'] != 0 || (!isset($data['data']) && !isset($data['data']['tab_list']))){
Log::error('抓取车型数据失败' . $data['message'], $data);
throw new \Exception('抓取车型数据失败' . $data['message']);
}
$models = [];
foreach ($data['data']['tab_list'] as $item) {
if($item['tab_text'] == '在售' || $item['tab_text'] == '停售'){
unset($item['data'][0]);
$models = array_merge($models, $item['data']);
}
}
foreach ($models as $key => $model) {
if(!isset($model["info"]['car_name']) || $model['type'] != "1115"){
unset($models[$key]);
continue;
}
$official_price = 0;
if(!isset($model["info"]['official_price'])){
$official_price = (int)(str_replace("万", "", $model["info"]['official_price_str']) * 10000) ?? 0;
}else{
$official_price = $model["info"]['official_price'] * 10000;
}
$models[$key] = [
'title' => $model["info"]['year'] . '款 ' .$model["info"]['car_name'],
'brand_name' => $model["info"]['brand_name'],
'series_name' => $model["info"]['series_name'],
'year' => $model["info"]['year'],
'msrp' => $official_price,
'car_id' => $model["info"]['id'],
];
}
return array_values($models);
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
}
// return $models;
}
/**
* 从懂车帝URL中提取series ID
* @param string $url 完整的URL
* @return string|null series ID或null
*/
function extractSeriesId($url) {
// 解析URL获取路径部分
$path = parse_url($url, PHP_URL_PATH);
if (!$path) {
return null;
}
// 按斜杠分割路径
$pathParts = explode('/', trim($path, '/'));
// 查找 'series' 的位置，下一个元素就是series ID
$seriesIndex = array_search('series', $pathParts);
if ($seriesIndex !== false && isset($pathParts[$seriesIndex + 1])) {
return $pathParts[$seriesIndex + 1];
}
return null;
}
/**
* 抓取车型数据(通过页面抓取)
* @param Request $request
* @return array
* @throws \Exception
*/
/*public function crawlModel(Request $request)
{
$series_id = $request->get('brand_series_id');
// 验证品牌是否存在
$series = BrandSeries::where('id', $series_id)->first();
if (!$series) {
throw new \Exception("系列ID {$series_id} 不存在");
}
// 获取品牌信息
$series = BrandSeries::where('id', $series_id)->first();
if (!$series) {
throw new \Exception("系列ID {$series_id} 不存在");
}
// 获取品牌信息
$brand = Brand::where('id', $series->brand_id)->first();
// 执行抓取
$crawlService = new CrawlService();
$models = $crawlService->seriesModel($brand->brand_name . ' ' . $series->series_name);
foreach ($models as $key => $model) {
$models[$key]['year'] = $this->extractYearFromCarModel($model['title']);
}
return $models;
}*/
/**
* @param Request $request
* @return array|string
* @throws \Exception
*/
public function crawlModelCreate(Request $request)
{
$series_id = $request->input('series_id');
// $brand_id = $request->input('brand_id');
$models = $request->input('models');
// 验证系列是否存在
$series = BrandSeries::where('id', $series_id)->first();
if (!$series) {
throw new \Exception("系列ID {$series_id} 不存在");
}
// 获取品牌信息
$brand = Brand::where('id', $series->brand_id)->first();
// 保存车型数据
$createdCount = 0;
$repeat = 0;
$fail = 0;
$msg = '';
foreach ($models as $item) {
$modelData = [
'brand_code' => $brand->brand_code,
'brand_name' => $brand->brand_name,
'series_code' => $series->series_code,
'series_name' => $series->series_name,
'model_name' => $item['title'],
'model_year' => $item['year'],
'msrp' => $item['msrp'],
];
$modelData['model_code'] = ModelNaming::buildModelCode($modelData);
$modelData['sku_code'] = SkuCodeBuilder::build($modelData);
// 指纹
$modelData['fingerprint'] = Fingerprint::makeFromArray($modelData);
try {
$model = VehVehicleSku::where('brand_name', $brand->brand_name)->where('series_name', $series->series_name)->where('model_name', $item['title'])->first();
if (!empty($model)) {
$repeat++;
continue;
}
CrudUtil::create(VehVehicleSku::class, $modelData);
$createdCount++;
} catch (\Exception $e) {
// 记录错误但继续处理其他车型
$msg .= "创建车型失败: " . $e->getMessage() . "\n";
Log::error("创建车型失败:" . $msg, ['series_id' => $series_id, 'model' => $item]);
$fail++;
}
}
Log::info('series-crawl-' . $series_id . ' ' . $msg);
$msg = '创建车型成功' . $createdCount . '条';
$msg .= (!empty($repeat)) ? '，重复' . $repeat . '条' : '';
$msg .= (!empty($fail)) ? '，失败' . $fail . '条' : '';
return $msg;
}
/**
* 从车型名中提取年份
* @param string $carModel 车型名称
* @return string|null 提取到的年份或null
*/
function extractYearFromCarModel($carModel)
{
// 匹配4位数字 + "款" 的模式
if (preg_match('/(\d{4})款/', $carModel, $matches)) {
return $matches[1];
}
// 匹配4位数字 + 空格或结尾的模式
if (preg_match('/^(\d{4})(?=\s|$)/', $carModel, $matches)) {
return $matches[1];
}
return null;
}
}
app/admin/service/BrandService.php
+77 -3
View File
@@ -3,9 +3,14 @@
namespace app\admin\service;
use app\admin\validate\BrandValidate;
use app\common\model\BrandSeries;
use app\common\service\CrawlService;
use app\common\traits\crud\CrudServiceTrait;
use app\common\model\Brand;
use app\common\utils\CrudUtil;
use support\Log;
use support\Request;
use Webman\RedisQueue\Redis;
class BrandService
{
@@ -27,7 +32,7 @@ class BrandService
*/
public function getValidator()
{
return new $this->validator;
return new $this->validator;
}
/**
@@ -49,13 +54,13 @@ class BrandService
// ====== ====== 筛选 ====== ======
// 状态
if (isset($p['status']) && in_array($p['status'], [0,1])) {
if (isset($p['status']) && in_array($p['status'], [0, 1])) {
$config['where']['status'] = $p['status'];
}
// 关键字
if (isset($p['keyword']) && $p['keyword']) {
$k = '%' . $p['keyword'] . '%';
foreach (['brand_code','brand_name'] as $col) {
foreach (['brand_code', 'brand_name'] as $col) {
$config['orWhere'][] = [$col, 'like', $k];
}
}
@@ -77,4 +82,73 @@ class BrandService
return $config;
}
public function crawlSeries(Request $request)
{
$brand_id = $request->get('brand_id');
// 验证品牌是否存在
$brand = Brand::where('id', $brand_id)->first();
if (!$brand) {
throw new \Exception("品牌ID {$brand_id} 不存在");
}
// 获取品牌信息
try {
// 执行抓取
$crawlService = new CrawlService();
$series = $crawlService->brandSeries($brand->brand_name);
if (empty($series)) {
throw new \Exception("未抓取到品牌 {$brand->brand_name} 的系列数据");
}
return ['series' => $series];
} catch (\Throwable $th) {
Log::error($th);
throw $th;
}
}
public function crawlSeriesCreate(Request $request)
{
$brand_id = $request->input('brand_id');
$series = $request->input('series');
// 保存系列数据
$seriesService = new \app\admin\service\BrandSeriesService();
$createdCount = 0;
$repeat = 0;
$fail = 0;
$msg = '';
foreach ($series as $item) {
$seriesData = [
'brand_id' => $brand_id,
'series_code' => $seriesService->generateUniqueModificationCode($brand_id),
'series_name' => $item,
];
try {
$brandseries = BrandSeries::where('brand_id', $brand_id)->where('series_name', $item)->first();
if (!empty($brandseries)) {
$repeat++;
continue;
}
CrudUtil::create(BrandSeries::class, $seriesData);
$createdCount++;
} catch (\Exception $e) {
// 记录错误但继续处理其他系列
$msg .= "创建系列失败: " . $e->getMessage() . "\n";
$fail++;
}
}
Log::info('brand-crawl-' . $brand_id . ' ' . $msg);
$msg = '创建系列成功' . $createdCount . '条';
$msg .= (!empty($repeat))?'，重复' . $repeat . '条':'';
$msg .= (!empty($fail))?'，失败' . $fail . '条':'';
return $msg;
}
}