From 6dbf4fbcab25bf6f9c391c0b6e0bcb43064b93b2 Mon Sep 17 00:00:00 2001
From: "zhangf@suq.cn" <zhangf@suq.cn>
Date: Wed, 17 Dec 2025 15:04:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(user):=20=E7=A7=BB=E9=99=A4=E8=92=B8?=
 =?UTF-8?q?=E9=A6=8F=E8=AF=8D=E6=89=A9=E5=B1=95=E5=8A=9F=E8=83=BD=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除 DistillationExpandWord 模型及相关 DAO 类
- 移除 DataBoardService 中对扩展词的依赖
- 修改统计逻辑，使用 questions_count 替代 expand_count
- 更新排序字段为 questions_count 并调整相关查询
- 在 DistillationWordService 中移除扩展词操作逻辑
- 将扩展词插入替换为问题插入操作
- 删除批量删除中的扩展词表更新逻辑
---
 app/dao/user/DistillationExpandWordDao.php   | 17 --------------
 app/model/user/DistillationExpandWord.php    | 33 ----------------------------
 app/model/user/DistillationWord.php          |  5 -----
 app/service/user/DataBoardService.php        | 11 ++++------
 app/service/user/DistillationWordService.php |  6 +----
 5 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 app/dao/user/DistillationExpandWordDao.php
 delete mode 100644 app/model/user/DistillationExpandWord.php

diff --git a/app/dao/user/DistillationExpandWordDao.php b/app/dao/user/DistillationExpandWordDao.php
deleted file mode 100644
index 4e9f8c4..0000000
--- a/app/dao/user/DistillationExpandWordDao.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace app\dao\user;
-
-use app\model\user\DistillationExpandWord;
-use plugin\piadmin\app\base\UserBaseDao;
-
-class DistillationExpandWordDao extends UserBaseDao
-{
-
-    protected function setModel(): string
-    {
-        return DistillationExpandWord::class;
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/model/user/DistillationExpandWord.php b/app/model/user/DistillationExpandWord.php
deleted file mode 100644
index e208b11..0000000
--- a/app/model/user/DistillationExpandWord.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace app\model\user;
-
-use plugin\piadmin\app\base\BaseModel;
-
-/**
- * 蒸馏词关联扩展词模型
- */
-class DistillationExpandWord extends BaseModel
-{
-    /**
-     * The table associated with the model.
-     *
-     * @var string
-     */
-    protected $table = 'geo_distillation_expand_word';
-
-    /**
-     * The primary key associated with the table.
-     *
-     * @var string
-     */
-    protected $primaryKey = 'id';
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var bool
-     */
-    public $timestamps = true;
-
-}
\ No newline at end of file
diff --git a/app/model/user/DistillationWord.php b/app/model/user/DistillationWord.php
index 49b2029..ca988ef 100644
--- a/app/model/user/DistillationWord.php
+++ b/app/model/user/DistillationWord.php
@@ -35,11 +35,6 @@ class DistillationWord extends BaseModel
         return $this->hasMany(DistillationTransWord::class, 'distillation_id', 'id');
     }
 
-    public function expand()
-    {
-        return $this->hasMany(DistillationExpandWord::class, 'distillation_id', 'id');
-    }
-
     public function questions()
     {
         return $this->hasMany(DistillationQuestions::class, 'distillation_id', 'id')->where(['delete_time' => 0]);
diff --git a/app/service/user/DataBoardService.php b/app/service/user/DataBoardService.php
index de0f495..77e1292 100644
--- a/app/service/user/DataBoardService.php
+++ b/app/service/user/DataBoardService.php
@@ -2,19 +2,16 @@
 
 namespace app\service\user;
 
-use app\dao\user\DistillationExpandWordDao;
 use app\dao\user\DistillationWordDao;
 use plugin\piadmin\app\base\BaseService;
 
 class DataBoardService extends BaseService
 {
     protected $distillationWordDao;
-    protected $distillationWordExtendDao;
 
     public function __construct()
     {
         $this->distillationWordDao = app()->make(DistillationWordDao::class);
-        $this->distillationWordExtendDao = app()->make(DistillationExpandWordDao::class);
     }
 
     /**
@@ -24,12 +21,12 @@ class DataBoardService extends BaseService
      */
     public function countStatistic()
     {
-        $res = $this->distillationWordDao->getList([], '*', 0, 0, 'expand_count DESC', [], ['expand']);
+        $res = $this->distillationWordDao->getList([], '*', 0, 0, 'questions_count DESC', [], ['questions']);
         return [
             'word' => sizeof($res),
-            'extend' => array_sum(array_column($res, 'expand_count')),
-            'top' => collect($res)->sortByDesc('expand_count')->take(10)->map(function ($item) {
-                return collect($item)->only(['id', 'name', 'expand_count'])->toArray();
+            'extend' => array_sum(array_column($res, 'questions_count')),
+            'top' => collect($res)->sortByDesc('questions_count')->take(10)->map(function ($item) {
+                return collect($item)->only(['id', 'name', 'questions_count'])->toArray();
             })->toArray(),
         ];
     }
diff --git a/app/service/user/DistillationWordService.php b/app/service/user/DistillationWordService.php
index c167394..62204c3 100644
--- a/app/service/user/DistillationWordService.php
+++ b/app/service/user/DistillationWordService.php
@@ -2,7 +2,6 @@
 
 namespace app\service\user;
 
-use app\dao\user\DistillationExpandWordDao;
 use app\dao\user\DistillationQuestionsDao;
 use app\dao\user\DistillationTransWordDao;
 use app\dao\user\DistillationWordDao;
@@ -17,14 +16,12 @@ class DistillationWordService extends BaseService
 
     protected $dao;
     protected $transDao;
-    protected $expandDao;
     protected $questionsDao;
 
     public function __construct(DistillationWordDao $dao)
     {
         $this->dao = $dao;
         $this->transDao = app()->make(DistillationTransWordDao::class);
-        $this->expandDao = app()->make(DistillationExpandWordDao::class);
         $this->questionsDao = app()->make(DistillationQuestionsDao::class);
     }
 
@@ -60,7 +57,7 @@ class DistillationWordService extends BaseService
                     'name' => $item
                 ];
             }
-            $this->expandDao->insertAll($expands);
+            $this->questionsDao->insertAll($expands);
             Db::commit();
         } catch (\Exception $exception) {
             Db::rollback();
@@ -166,7 +163,6 @@ class DistillationWordService extends BaseService
             $this->dao->update([['id', 'in', $ids]], ['delete_time' => time()]);
             //删子表
             $this->transDao->update([['distillation_id', 'in', $ids]],  ['delete_time' => time()]);
-            $this->expandDao->update([['distillation_id', 'in', $ids]],  ['delete_time' => time()]);
             $this->questionsDao->update([['distillation_id', 'in', $ids]],  ['delete_time' => time()]);
             Db::commit();
         } catch (\Exception $exception) {