From c662a567bde597f2c893070bdcdf410e094ced11 Mon Sep 17 00:00:00 2001
From: Lxy <windsdreaming@163.com>
Date: Sun, 25 Jan 2026 14:00:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8A=A8=E9=87=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9F=BA=E6=9C=AC=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/newstocksystem/domain/TTrends.java  |  32 +-----
 .../mapper/newstocksystem/TTrendsMapper.xml   |  33 ++----
 ruoyi-ui/src/api/newstocksystem/stockdata.js  |  11 ++
 .../src/views/newstocksystem/stockdata.vue    | 100 ++++++++++++++++++
 4 files changed, 121 insertions(+), 55 deletions(-)

diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TTrends.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TTrends.java
index b98b467..348143c 100644
--- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TTrends.java
+++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TTrends.java
@@ -7,7 +7,6 @@ import java.util.Date;
 
 /**
  * 趋势对象 t_trends
- * 注意：由于该表是分区表，不支持外键约束，但业务逻辑中仍需确保eastmoney_industry_code在t_industry_index_basic表中存在
  * 
  * @author lxy
  * @date 2026-01-21
@@ -27,14 +26,6 @@ public class TTrends extends BaseEntity
     /** 行业名称（关联t_industry_basic表） */
     @Excel(name = "行业名称")
     private String industryName;
-    
-    /** 所属东财行业代码 */
-    @Excel(name = "东财行业代码")
-    private String eastmoneyIndustryCode;
-
-    /** 所属东财行业名称 */
-    @Excel(name = "东财行业名称")
-    private String eastmoneyIndustryName;
 
     /** 动量个股数量 */
     @Excel(name = "动量个股数量")
@@ -97,26 +88,6 @@ public class TTrends extends BaseEntity
     {
         this.industryName = industryName;
     }
-    
-    public String getEastmoneyIndustryCode()
-    {
-        return eastmoneyIndustryCode;
-    }
-
-    public void setEastmoneyIndustryCode(String eastmoneyIndustryCode)
-    {
-        this.eastmoneyIndustryCode = eastmoneyIndustryCode;
-    }
-
-    public String getEastmoneyIndustryName()
-    {
-        return eastmoneyIndustryName;
-    }
-
-    public void setEastmoneyIndustryName(String eastmoneyIndustryName)
-    {
-        this.eastmoneyIndustryName = eastmoneyIndustryName;
-    }
 
     public Double getStocksCount()
     {
@@ -203,8 +174,7 @@ public class TTrends extends BaseEntity
         return "TTrends{" +
                 "id=" + id +
                 ", tradeDate=" + tradeDate +
-                ", eastmoneyIndustryCode='" + eastmoneyIndustryCode + '\'' +
-                ", eastmoneyIndustryName='" + eastmoneyIndustryName + '\'' +
+                ", industryName='" + industryName + '\'' +
                 ", stocksCount=" + stocksCount +
                 ", trendValue=" + trendValue +
                 ", trendValueChange=" + trendValueChange +
diff --git a/newstock-system/src/main/resources/mapper/newstocksystem/TTrendsMapper.xml b/newstock-system/src/main/resources/mapper/newstocksystem/TTrendsMapper.xml
index e0f49a2..867467f 100644
--- a/newstock-system/src/main/resources/mapper/newstocksystem/TTrendsMapper.xml
+++ b/newstock-system/src/main/resources/mapper/newstocksystem/TTrendsMapper.xml
@@ -8,8 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <id     property="id"                           column="id"                           />
         <result property="tradeDate"                    column="trade_date"                    />
         <result property="industryName"                 column="industry_name"                 />
-        <result property="eastmoneyIndustryCode"        column="eastmoney_industry_code"        />
-        <result property="eastmoneyIndustryName"        column="eastmoney_industry_name"        />
         <result property="stocksCount"                  column="stocks_count"                  />
         <result property="trendValue"                   column="trend_value"                   />
         <result property="trendValueChange"             column="trend_value_change"             />
@@ -21,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTrendsVo">
-        select id, trade_date, industry_name, eastmoney_industry_code, eastmoney_industry_name, stocks_count, trend_value, trend_value_change, rank, rank_change, momentum_type, create_time, update_time from t_trends
+        select id, trade_date, industry_name, stocks_count, trend_value, trend_value_change, `rank`, `rank_change`, momentum_type, create_time, update_time from t_trends
     </sql>
 
     <select id="selectTTrendsById" parameterType="Long" resultMap="TTrendsResult">
@@ -34,8 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="tradeDate != null ">and trade_date = #{tradeDate}</if>
             <if test="industryName != null  and industryName != ''">and industry_name = #{industryName}</if>
-            <if test="eastmoneyIndustryCode != null  and eastmoneyIndustryCode != ''">and eastmoney_industry_code = #{eastmoneyIndustryCode}</if>
-            <if test="eastmoneyIndustryName != null  and eastmoneyIndustryName != ''">and eastmoney_industry_name = #{eastmoneyIndustryName}</if>
             <if test="stocksCount != null ">and stocks_count = #{stocksCount}</if>
             <if test="trendValue != null ">and trend_value = #{trendValue}</if>
             <if test="trendValueChange != null ">and trend_value_change = #{trendValueChange}</if>
@@ -50,13 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="tradeDate != null">trade_date,</if>
             <if test="industryName != null and industryName != ''">industry_name,</if>
-            <if test="eastmoneyIndustryCode != null and eastmoneyIndustryCode != ''">eastmoney_industry_code,</if>
-            <if test="eastmoneyIndustryName != null and eastmoneyIndustryName != ''">eastmoney_industry_name,</if>
             <if test="stocksCount != null">stocks_count,</if>
             <if test="trendValue != null">trend_value,</if>
             <if test="trendValueChange != null">trend_value_change,</if>
-            <if test="rank != null">rank,</if>
-            <if test="rankChange != null">rank_change,</if>
+            <if test="rank != null">`rank`,</if>
+            <if test="rankChange != null">`rank_change`,</if>
             <if test="momentumType != null and momentumType != ''">momentum_type,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
@@ -64,8 +58,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tradeDate != null">#{tradeDate},</if>
             <if test="industryName != null and industryName != ''">#{industryName},</if>
-            <if test="eastmoneyIndustryCode != null and eastmoneyIndustryCode != ''">#{eastmoneyIndustryCode},</if>
-            <if test="eastmoneyIndustryName != null and eastmoneyIndustryName != ''">#{eastmoneyIndustryName},</if>
             <if test="stocksCount != null">#{stocksCount},</if>
             <if test="trendValue != null">#{trendValue},</if>
             <if test="trendValueChange != null">#{trendValueChange},</if>
@@ -82,13 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="tradeDate != null">trade_date = #{tradeDate},</if>
             <if test="industryName != null and industryName != ''">industry_name = #{industryName},</if>
-            <if test="eastmoneyIndustryCode != null and eastmoneyIndustryCode != ''">eastmoney_industry_code = #{eastmoneyIndustryCode},</if>
-            <if test="eastmoneyIndustryName != null and eastmoneyIndustryName != ''">eastmoney_industry_name = #{eastmoneyIndustryName},</if>
             <if test="stocksCount != null">stocks_count = #{stocksCount},</if>
             <if test="trendValue != null">trend_value = #{trendValue},</if>
             <if test="trendValueChange != null">trend_value_change = #{trendValueChange},</if>
-            <if test="rank != null">rank = #{rank},</if>
-            <if test="rankChange != null">rank_change = #{rankChange},</if>
+            <if test="rank != null">`rank` = #{rank},</if>
+            <if test="rankChange != null">`rank_change` = #{rankChange},</if>
             <if test="momentumType != null and momentumType != ''">momentum_type = #{momentumType},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
@@ -110,13 +100,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         INSERT INTO t_trends (
             trade_date,
             industry_name,
-            eastmoney_industry_code,
-            eastmoney_industry_name,
             stocks_count,
             trend_value,
             trend_value_change,
-            rank,
-            rank_change,
+            `rank`,
+            `rank_change`,
             momentum_type,
             create_time,
             update_time
@@ -125,8 +113,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (
                 #{item.tradeDate},
                 #{item.industryName},
-                #{item.eastmoneyIndustryCode},
-                #{item.eastmoneyIndustryName},
                 #{item.stocksCount},
                 #{item.trendValue},
                 #{item.trendValueChange},
@@ -141,9 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             stocks_count = VALUES(stocks_count),
             trend_value = VALUES(trend_value),
             trend_value_change = VALUES(trend_value_change),
-            rank = VALUES(rank),
-            rank_change = VALUES(rank_change),
-            eastmoney_industry_name = VALUES(eastmoney_industry_name),
+            `rank` = VALUES(`rank`),
+            `rank_change` = VALUES(`rank_change`),
             update_time = VALUES(update_time)
     </insert>
     
diff --git a/ruoyi-ui/src/api/newstocksystem/stockdata.js b/ruoyi-ui/src/api/newstocksystem/stockdata.js
index 28316c5..cdf5063 100644
--- a/ruoyi-ui/src/api/newstocksystem/stockdata.js
+++ b/ruoyi-ui/src/api/newstocksystem/stockdata.js
@@ -186,6 +186,17 @@ export default {
       params: query
     })
   },
+  
+  // ========================= 趋势数据相关 =========================
+  
+  // 查询趋势列表
+  listTrends(query) {
+    return request({
+      url: '/newstocksystem/trends/list',
+      method: 'get',
+      params: query
+    })
+  },
 
   // 查询个股新高新低状态列表（包含基础信息）
   listStockHighLowStatusWithBasic(query) {
diff --git a/ruoyi-ui/src/views/newstocksystem/stockdata.vue b/ruoyi-ui/src/views/newstocksystem/stockdata.vue
index 6fb3581..5aaa47a 100644
--- a/ruoyi-ui/src/views/newstocksystem/stockdata.vue
+++ b/ruoyi-ui/src/views/newstocksystem/stockdata.vue
@@ -237,6 +237,58 @@
 
         <pagination v-show="stockHighLowTotal > 0" :total="stockHighLowTotal" :page.sync="stockHighLowQuery.pageNum" :limit.sync="stockHighLowQuery.pageSize" @pagination="getStockHighLowList" />
       </el-tab-pane>
+      
+      <!-- 趋势数据 Tab -->
+      <el-tab-pane label="趋势数据" name="trends">
+        <el-form :model="trendsQuery" ref="trendsForm" size="small" :inline="true" label-width="100px">
+          <el-form-item label="交易日期" prop="tradeDate">
+            <el-date-picker v-model="trendsQuery.tradeDate" type="date" value-format="yyyy-MM-dd" placeholder="选择交易日期" clearable />
+          </el-form-item>
+          <el-form-item label="行业名称" prop="industryName">
+            <el-input v-model="trendsQuery.industryName" placeholder="请输入行业名称" clearable @keyup.enter.native="queryTrends" />
+          </el-form-item>
+          <el-form-item label="动量类型" prop="momentumType">
+            <el-select v-model="trendsQuery.momentumType" placeholder="请选择动量类型">
+              <el-option label="1日" :value="'1'" />
+              <el-option label="3日" :value="'3'" />
+              <el-option label="5日" :value="'5'" />
+              <el-option label="10日" :value="'10'" />
+              <el-option label="15日" :value="'15'" />
+              <el-option label="20日" :value="'20'" />
+              <el-option label="30日" :value="'30'" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="queryTrends">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetTrendsQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="trendsLoading" :data="trendsList" border fit highlight-current-row>
+          <el-table-column label="交易日期" align="center" prop="tradeDate" width="120" />
+          <el-table-column label="行业名称" align="center" prop="industryName" min-width="120" />
+          <el-table-column label="动量个股数量" align="center" prop="stocksCount" width="120" />
+          <el-table-column label="动量值" align="center" prop="trendValue" width="100">
+            <template slot-scope="scope">
+              <span :class="getChangeClass(scope.row.trendValue)">
+                {{ formatPercent(scope.row.trendValue) }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="动量值变化" align="center" prop="trendValueChange" width="110">
+            <template slot-scope="scope">
+              <span :class="getChangeClass(scope.row.trendValueChange)">
+                {{ formatPercent(scope.row.trendValueChange) }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="板块排名" align="center" prop="rank" width="90" />
+          <el-table-column label="排名变化" align="center" prop="rankChange" width="90" />
+          <el-table-column label="动量类型" align="center" prop="momentumType" width="90" />
+        </el-table>
+
+        <pagination v-show="trendsTotal > 0" :total="trendsTotal" :page.sync="trendsQuery.pageNum" :limit.sync="trendsQuery.pageSize" @pagination="getTrendsList" />
+      </el-tab-pane>
     </el-tabs>
 
     <!-- 导入对话框 -->
@@ -346,6 +398,18 @@ export default {
         tradeDate: null,
         isNewHigh: null
       },
+      
+      // ========================= 趋势数据 =========================
+      trendsLoading: false,
+      trendsList: [],
+      trendsTotal: 0,
+      trendsQuery: {
+        pageNum: 1,
+        pageSize: 10,
+        tradeDate: null,
+        industryName: null,
+        momentumType: '10'
+      },
 
       // ========================= 上传相关 =========================
       upload: {
@@ -399,6 +463,7 @@ export default {
           this.dailyTradeQuery.tradeDate = lastTradeDate
           this.industryIndexQuery.tradeDate = lastTradeDate
           this.stockHighLowQuery.tradeDate = lastTradeDate
+          this.trendsQuery.tradeDate = lastTradeDate
           // 检查分析状态
           this.checkAnalysisStatus(lastTradeDate)
         }
@@ -434,6 +499,8 @@ export default {
         this.getIndustryIndexList()
       } else if (tab.name === 'stockHighLow') {
         this.getStockHighLowList()
+      } else if (tab.name === 'trends') {
+        this.getTrendsList()
       }
     },
 
@@ -584,6 +651,39 @@ export default {
       }
       this.getStockHighLowList()
     },
+    
+    // ========================= 趋势数据方法 =========================
+    
+    /** 获取趋势数据列表 */
+    getTrendsList() {
+      this.trendsLoading = true
+      stockdataApi.listTrends(this.trendsQuery).then(response => {
+        this.trendsList = response.rows
+        this.trendsTotal = response.total
+        this.trendsLoading = false
+      }).catch(() => {
+        this.trendsLoading = false
+      })
+    },
+    
+    /** 查询趋势数据 */
+    queryTrends() {
+      this.trendsQuery.pageNum = 1
+      this.getTrendsList()
+    },
+    
+    /** 重置趋势数据查询 */
+    resetTrendsQuery() {
+      this.$refs.trendsForm.resetFields()
+      this.trendsQuery = {
+        pageNum: 1,
+        pageSize: 10,
+        tradeDate: null,
+        industryName: null,
+        momentumType: '10'
+      }
+      this.getTrendsList()
+    },
 
     // ========================= 行业指数数据方法 =========================