From aa959c660d6053dc2a3aaf33e9a5f076f0ba4465 Mon Sep 17 00:00:00 2001
From: laixingyu <xingyu.lai@suwell.cn>
Date: Tue, 8 Aug 2023 18:31:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8A=A8=E9=87=8F=E7=89=88=E5=9D=97=E6=95=B0=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=89=94=E7=BB=99=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DongCaiSecondaryIndustryMapper.xml |  39 ++-
 .../pojo/domain/DongCaiSecondaryIndustry.java | 153 +++++++++++
 .../DongCaiSecondaryIndustryResponse.java     | 198 +++++++++++++-
 ...aiSecondaryIndustryStatisticsResponse.java | 244 ++++++++++++++++++
 4 files changed, 620 insertions(+), 14 deletions(-)
 create mode 100644 ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryStatisticsResponse.java

diff --git a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/mapper/DongCaiSecondaryIndustryMapper.xml b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/mapper/DongCaiSecondaryIndustryMapper.xml
index 8d213cf..4e29f1e 100644
--- a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/mapper/DongCaiSecondaryIndustryMapper.xml
+++ b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/mapper/DongCaiSecondaryIndustryMapper.xml
@@ -60,15 +60,50 @@
                                               @Param("sortChangeSort")String sortChangeSort,
                                               @Param("type")String type);
     -->
+    <!--原实现，仅查动量值; 20230808更改为还差多日的数据-->
+<!--    <select id="trends" resultType="com.ssdmn.biz.gupiao.pojo.domain.DongCaiSecondaryIndustry">-->
+<!--        select t.trade_day as businessDate, t.blemind2 as securityName,d.security_code as securityCode,d.number_ingredients as numberIngredients, d.opening_price as openingPrice,-->
+<!--        d.closing_price as closingPrice,d.volume as volume,d.turnover as turnover,d.total_capitalization as totalCapitalization,d.free_capitalization as freeCapitalization,-->
+<!--        d.change_percentage as changePercentage,d.highest_price as highestPrice,d.lowest_price as lowestPrice, d.rise_number as riseNumber,d.losses_number as lossesNumber,-->
+<!--        d.flat_number as flatNumber, d.rise_stop_number as riseStopNumber,d.losses_stop_number as lossesStopNumber,d.stop_number as stopNumber,d.recently_high as recentlyHigh,-->
+<!--        d.recently_low as recentlyLow,d.pe_ttm as peTtm,d.pe_center_ttm as peCenterTtm,t.sort as sort,t.sort_change as sortChange, t.trend_value as trendValue,t.trend_value_change as trendValueChange-->
+<!--        from trends t-->
+<!--        left join dong_cai_secondary_industry d on (t.blemind2 = d.security_name)-->
+<!--        where t.trade_day = #{firstDate} and d.business_date = #{firstDate} and t.type = #{type}-->
+<!--        <choose>-->
+<!--            <when test="sortSort != null and sortSort.trim() != '' and sortChangeSort != null and sortChangeSort.trim() != ''">-->
+<!--                order by sort ${sortSort},sortChange ${sortChangeSort}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                <if test="sortSort != null and sortSort.trim() != '' ">-->
+<!--                    order by sort ${sortSort}-->
+<!--                </if>-->
+<!--                <if test="sortChangeSort != null and sortChangeSort.trim() != ''">-->
+<!--                    order by  sortChange ${sortChangeSort}-->
+<!--                </if>-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+<!--    </select>-->
     <select id="trends" resultType="com.ssdmn.biz.gupiao.pojo.domain.DongCaiSecondaryIndustry">
         select t.trade_day as businessDate, t.blemind2 as securityName,d.security_code as securityCode,d.number_ingredients as numberIngredients, d.opening_price as openingPrice,
         d.closing_price as closingPrice,d.volume as volume,d.turnover as turnover,d.total_capitalization as totalCapitalization,d.free_capitalization as freeCapitalization,
         d.change_percentage as changePercentage,d.highest_price as highestPrice,d.lowest_price as lowestPrice, d.rise_number as riseNumber,d.losses_number as lossesNumber,
         d.flat_number as flatNumber, d.rise_stop_number as riseStopNumber,d.losses_stop_number as lossesStopNumber,d.stop_number as stopNumber,d.recently_high as recentlyHigh,
-        d.recently_low as recentlyLow,d.pe_ttm as peTtm,d.pe_center_ttm as peCenterTtm,t.sort as sort,t.sort_change as sortChange, t.trend_value as trendValue,t.trend_value_change as trendValueChange
+        d.recently_low as recentlyLow,d.pe_ttm as peTtm,d.pe_center_ttm as peCenterTtm,t.sort as sort,t.sort_change as sortChange, t.trend_value as trendValue,t.trend_value_change as trendValueChange,
+        ds.turnover_change as turnoverChange,ds.turnover_ratio as turnoverRatio,ds.turnover_ratio_change as turnoverRatioChange,ds.turnover_sort as turnoverSort,ds.turnover_sort_change as turnoverSortChange,
+        ds.turnover5 as turnover5,ds.turnover5_change as turnover5Change,ds.turnover5_ratio as turnover5Ratio,ds.turnover5_ratio_change as turnover5RatioChange,ds.turnover5_sort as turnover5Sort,ds.turnover5_sort_change as turnover5SortChange,
+        ds.turnover10 as turnover10,ds.turnover10_change as turnover10Change,ds.turnover10_ratio as turnover10Ratio,ds.turnover10_ratio_change as turnover10RatioChange,ds.turnover10_sort as turnover10Sort,ds.turnover10_sort_change as turnover10SortChange,
+        ds.turnover20 as turnover20,ds.turnover20_change as turnover20Change,ds.turnover20_ratio as turnover20Ratio,ds.turnover20_ratio_change as turnover20RatioChange,ds.turnover20_sort as turnover20Sort,ds.turnover20_sort_change as turnover20SortChange,
+        ds.turnover30 as turnover30,ds.turnover30_change as turnover30Change,ds.turnover30_ratio as turnover30Ratio,ds.turnover30_ratio_change as turnover30RatioChange,ds.turnover30_sort as turnover30Sort,ds.turnover30_sort_change as turnover30SortChange,
+        ds.rise_number_change as riseNumberChange,ds.losses_number_change as lossesNumberChange,ds.flat_number_change as flatNumberChange,
+        ds.rise5_number as rise5Number,ds.rise5_number_change as rise5NumberChange,ds.losses5_number as losses5Number,ds.losses5_number_change as losses5NumberChange,ds.flat5_number as flat5Number,ds.flat5_number_change as flat5NumberChange,
+        ds.rise10_number as rise10Number,ds.rise10_number_change as rise10NumberChange,ds.losses10_number as losses10Number,ds.losses10_number_change as losses10NumberChange,ds.flat10_number as flat10Number,ds.flat10_number_change as flat10NumberChange,
+        ds.rise20_number as rise20Number,ds.rise20_number_change as rise20NumberChange,ds.losses20_number as losses20Number,ds.losses20_number_change as losses20NumberChange,ds.flat20_number as flat20Number,ds.flat20_number_change as flat20NumberChange,
+        ds.rise30_number as rise30Number,ds.rise30_number_change as rise30NumberChange,ds.losses30_number as losses30Number,ds.losses30_number_change as losses30NumberChange,ds.flat30_number as flat30Number,ds.flat30_number_change as flat30NumberChange
         from trends t
         left join dong_cai_secondary_industry d on (t.blemind2 = d.security_name)
-        where t.trade_day = #{firstDate} and d.business_date = #{firstDate} and t.type = #{type}
+        left join dong_cai_secondary_industry_statistics ds on (t.blemind2 = ds.security_name)
+        where t.trade_day = #{firstDate} and d.business_date = #{firstDate} and t.type = #{type} and ds.business_date = #{firstDate}
         <choose>
             <when test="sortSort != null and sortSort.trim() != '' and sortChangeSort != null and sortChangeSort.trim() != ''">
                 order by sort ${sortSort},sortChange ${sortChangeSort}
diff --git a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/domain/DongCaiSecondaryIndustry.java b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/domain/DongCaiSecondaryIndustry.java
index 45d1f41..9e2b165 100644
--- a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/domain/DongCaiSecondaryIndustry.java
+++ b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/domain/DongCaiSecondaryIndustry.java
@@ -137,4 +137,157 @@ public class DongCaiSecondaryIndustry {
     @TableField(exist=false)
     private Integer trendValueChange;
 
+    @ApiModelProperty("成交排名")
+    private Integer turnoverSort;
+
+    @ApiModelProperty("成交排名变化")
+    private Integer turnoverSortChange;
+
+    @ApiModelProperty("5日成交额(百万元)")
+    private BigDecimal turnover5;
+
+    @ApiModelProperty("5日成交额变化(百万元)")
+    private BigDecimal turnover5Change;
+
+    @ApiModelProperty("5日成交额占比")
+    private BigDecimal turnover5Ratio;
+
+    @ApiModelProperty("5日成交额占比(百万元)")
+    private BigDecimal turnover5RatioChange;
+
+    @ApiModelProperty("5日成交排名")
+    private Integer turnover5Sort;
+
+    @ApiModelProperty("5日成交排名变化")
+    private Integer turnover5SortChange;
+
+    @ApiModelProperty("10日成交额(百万元)")
+    private BigDecimal turnover10;
+
+    @ApiModelProperty("10日成交额变化(百万元)")
+    private BigDecimal turnover10Change;
+
+    @ApiModelProperty("10日成交额占比")
+    private BigDecimal turnover10Ratio;
+
+    @ApiModelProperty("10日成交额占比(百万元)")
+    private BigDecimal turnover10RatioChange;
+
+    @ApiModelProperty("10日成交排名")
+    private Integer turnover10Sort;
+
+    @ApiModelProperty("10日成交排名变化")
+    private Integer turnoverSort10Change;
+
+    @ApiModelProperty("20日成交额(百万元)")
+    private BigDecimal turnover20;
+
+    @ApiModelProperty("20日成交额变化(百万元)")
+    private BigDecimal turnover20Change;
+
+    @ApiModelProperty("20日成交额占比")
+    private BigDecimal turnover20Ratio;
+
+    @ApiModelProperty("20日成交额占比(百万元)")
+    private BigDecimal turnover20RatioChange;
+
+    @ApiModelProperty("20日成交排名")
+    private Integer turnover20Sort;
+
+    @ApiModelProperty("成交排名变化")
+    private Integer turnover20SortChange;
+
+    @ApiModelProperty("30日成交额(百万元)")
+    private BigDecimal turnover30;
+
+    @ApiModelProperty("30日成交额变化(百万元)")
+    private BigDecimal turnover30Change;
+
+    @ApiModelProperty("30日成交额占比")
+    private BigDecimal turnover30Ratio;
+
+    @ApiModelProperty("30日成交额占比(百万元)")
+    private BigDecimal turnover30RatioChange;
+
+    @ApiModelProperty("30日成交排名")
+    private Integer turnover30Sort;
+
+    @ApiModelProperty("30日成交排名变化")
+    private Integer turnover30SortChange;
+
+    @ApiModelProperty("上涨家数变化")
+    private String riseNumberChange;
+    @ApiModelProperty("下跌家数变化")
+    private String lossesNumberChange;
+
+    @ApiModelProperty("平盘家数变化")
+    private String flatNumberChange;
+
+    @ApiModelProperty("5日上涨家数")
+    private String rise5Number;
+    @ApiModelProperty("5日上涨家数变化")
+    private String rise5NumberChange;
+
+    @ApiModelProperty("5日下跌家数")
+    private String losses5Number;
+
+    @ApiModelProperty("5日下跌家数")
+    private String losses5NumberChange;
+
+    @ApiModelProperty("5日平盘家数")
+    private String flat5Number;
+
+    @ApiModelProperty("5日平盘家数")
+    private String flat5NumberChange;
+
+    @ApiModelProperty("10日上涨家数")
+    private String rise10Number;
+    @ApiModelProperty("10日上涨家数变化")
+    private String rise10NumberChange;
+
+    @ApiModelProperty("10日下跌家数")
+    private String losses10Number;
+
+    @ApiModelProperty("10日下跌家数")
+    private String losses10NumberChange;
+
+    @ApiModelProperty("10日平盘家数")
+    private String flat10Number;
+
+    @ApiModelProperty("10日平盘家数")
+    private String flat10NumberChange;
+
+    @ApiModelProperty("20日上涨家数")
+    private String rise20Number;
+    @ApiModelProperty("20日上涨家数变化")
+    private String rise20NumberChange;
+
+    @ApiModelProperty("20日下跌家数")
+    private String losses20Number;
+
+    @ApiModelProperty("20日下跌家数")
+    private String losses20NumberChange;
+
+    @ApiModelProperty("20日平盘家数")
+    private String flat20Number;
+
+    @ApiModelProperty("20日平盘家数")
+    private String flat20NumberChange;
+
+    @ApiModelProperty("30日上涨家数")
+    private String rise30Number;
+    @ApiModelProperty("30日上涨家数变化")
+    private String rise30NumberChange;
+
+    @ApiModelProperty("30日下跌家数")
+    private String losses30Number;
+
+    @ApiModelProperty("30日下跌家数")
+    private String losses30NumberChange;
+
+    @ApiModelProperty("30日平盘家数")
+    private String flat30Number;
+
+    @ApiModelProperty("30日平盘家数")
+    private String flat30NumberChange;
 }
diff --git a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryResponse.java b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryResponse.java
index 0334fd3..65a21ed 100644
--- a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryResponse.java
+++ b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryResponse.java
@@ -3,6 +3,7 @@ package com.ssdmn.biz.gupiao.pojo.response;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,36 +28,209 @@ public class DongCaiSecondaryIndustryResponse {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8" )
     private Date businessDate;
 
-    @ApiModelProperty("排名")
-    private Integer sort;
-
-    @ApiModelProperty("板块排名变化")
-    private Integer plateUpOrDown;
-
-    @ApiModelProperty("排名变化")
-    private Integer sortChange;
+    @ApiModelProperty("证券名称")
+    private String securityName;
 
     @ApiModelProperty("证券代码")
     private String securityCode;
 
-    @ApiModelProperty("证券名称")
-    private String securityName;
+    @ApiModelProperty("动量排名")
+    private Integer sort;
 
-    @ApiModelProperty("证券类型")
-    private String securityType;
+    @ApiModelProperty("动量排名变化")
+    private Integer sortChange;
+
+    @ApiModelProperty("动量值")
+    @TableField(exist=false)
+    private Integer trendValue;
+
+    @ApiModelProperty("动量值变化")
+    @TableField(exist=false)
+    private Integer trendValueChange;
 
     @ApiModelProperty("成交额(百万元)")
     private BigDecimal turnover;
 
+    @ApiModelProperty("成交额变化(百万元)")
+    private BigDecimal turnoverChange;
+
+    @ApiModelProperty("成交额占比")
+    private BigDecimal turnoverRatio;
+
+    @ApiModelProperty("成交额占比(百万元)")
+    private BigDecimal turnoverRatioChange;
+
+    @ApiModelProperty("成交排名")
+    private Integer turnoverSort;
+
+    @ApiModelProperty("成交排名变化")
+    private Integer turnoverSortChange;
+
+    @ApiModelProperty("5日成交额(百万元)")
+    private BigDecimal turnover5;
+
+    @ApiModelProperty("5日成交额变化(百万元)")
+    private BigDecimal turnover5Change;
+
+    @ApiModelProperty("5日成交额占比")
+    private BigDecimal turnover5Ratio;
+
+    @ApiModelProperty("5日成交额占比(百万元)")
+    private BigDecimal turnover5RatioChange;
+
+    @ApiModelProperty("5日成交排名")
+    private Integer turnover5Sort;
+
+    @ApiModelProperty("5日成交排名变化")
+    private Integer turnover5SortChange;
+
+    @ApiModelProperty("10日成交额(百万元)")
+    private BigDecimal turnover10;
+
+    @ApiModelProperty("10日成交额变化(百万元)")
+    private BigDecimal turnover10Change;
+
+    @ApiModelProperty("10日成交额占比")
+    private BigDecimal turnover10Ratio;
+
+    @ApiModelProperty("10日成交额占比(百万元)")
+    private BigDecimal turnover10RatioChange;
+
+    @ApiModelProperty("10日成交排名")
+    private Integer turnover10Sort;
+
+    @ApiModelProperty("10日成交排名变化")
+    private Integer turnoverSort10Change;
+
+    @ApiModelProperty("20日成交额(百万元)")
+    private BigDecimal turnover20;
+
+    @ApiModelProperty("20日成交额变化(百万元)")
+    private BigDecimal turnover20Change;
+
+    @ApiModelProperty("20日成交额占比")
+    private BigDecimal turnover20Ratio;
+
+    @ApiModelProperty("20日成交额占比(百万元)")
+    private BigDecimal turnover20RatioChange;
+
+    @ApiModelProperty("20日成交排名")
+    private Integer turnover20Sort;
+
+    @ApiModelProperty("成交排名变化")
+    private Integer turnover20SortChange;
+
+    @ApiModelProperty("30日成交额(百万元)")
+    private BigDecimal turnover30;
+
+    @ApiModelProperty("30日成交额变化(百万元)")
+    private BigDecimal turnover30Change;
+
+    @ApiModelProperty("30日成交额占比")
+    private BigDecimal turnover30Ratio;
+
+    @ApiModelProperty("30日成交额占比(百万元)")
+    private BigDecimal turnover30RatioChange;
+
+    @ApiModelProperty("30日成交排名")
+    private Integer turnover30Sort;
+
+    @ApiModelProperty("30日成交排名变化")
+    private Integer turnover30SortChange;
+
     @ApiModelProperty("上涨家数")
     private String riseNumber;
+    @ApiModelProperty("上涨家数变化")
+    private String riseNumberChange;
 
     @ApiModelProperty("下跌家数")
     private String lossesNumber;
 
+    @ApiModelProperty("下跌家数变化")
+    private String lossesNumberChange;
+
     @ApiModelProperty("平盘家数")
     private String flatNumber;
 
+    @ApiModelProperty("平盘家数变化")
+    private String flatNumberChange;
+
+    @ApiModelProperty("5日上涨家数")
+    private String rise5Number;
+    @ApiModelProperty("5日上涨家数变化")
+    private String rise5NumberChange;
+
+    @ApiModelProperty("5日下跌家数")
+    private String losses5Number;
+
+    @ApiModelProperty("5日下跌家数")
+    private String losses5NumberChange;
+
+    @ApiModelProperty("5日平盘家数")
+    private String flat5Number;
+
+    @ApiModelProperty("5日平盘家数")
+    private String flat5NumberChange;
+
+    @ApiModelProperty("10日上涨家数")
+    private String rise10Number;
+    @ApiModelProperty("10日上涨家数变化")
+    private String rise10NumberChange;
+
+    @ApiModelProperty("10日下跌家数")
+    private String losses10Number;
+
+    @ApiModelProperty("10日下跌家数")
+    private String losses10NumberChange;
+
+    @ApiModelProperty("10日平盘家数")
+    private String flat10Number;
+
+    @ApiModelProperty("10日平盘家数")
+    private String flat10NumberChange;
+
+    @ApiModelProperty("20日上涨家数")
+    private String rise20Number;
+    @ApiModelProperty("20日上涨家数变化")
+    private String rise20NumberChange;
+
+    @ApiModelProperty("20日下跌家数")
+    private String losses20Number;
+
+    @ApiModelProperty("20日下跌家数")
+    private String losses20NumberChange;
+
+    @ApiModelProperty("20日平盘家数")
+    private String flat20Number;
+
+    @ApiModelProperty("20日平盘家数")
+    private String flat20NumberChange;
+
+    @ApiModelProperty("30日上涨家数")
+    private String rise30Number;
+    @ApiModelProperty("30日上涨家数变化")
+    private String rise30NumberChange;
+
+    @ApiModelProperty("30日下跌家数")
+    private String losses30Number;
+
+    @ApiModelProperty("30日下跌家数")
+    private String losses30NumberChange;
+
+    @ApiModelProperty("30日平盘家数")
+    private String flat30Number;
+
+    @ApiModelProperty("30日平盘家数")
+    private String flat30NumberChange;
+
+    //todo 需要增加 上涨下跌占比
+
+    @ApiModelProperty("板块排名变化")
+    private Integer plateUpOrDown;
+
+    @ApiModelProperty("证券类型")
+    private String securityType;
+
     public Integer getPlateUpOrDown() {
         if(ObjectUtil.isEmpty(plateUpOrDown)){
             return 0;
diff --git a/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryStatisticsResponse.java b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryStatisticsResponse.java
new file mode 100644
index 0000000..3f4aabb
--- /dev/null
+++ b/ssdmn-chat-gpt-api/src/main/java/com/ssdmn/biz/gupiao/pojo/response/DongCaiSecondaryIndustryStatisticsResponse.java
@@ -0,0 +1,244 @@
+package com.ssdmn.biz.gupiao.pojo.response;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author: lxy
+ * @Version: 1.0
+ * @CreateTime: 2023/8/8 17:07
+ */
+@Data
+public class DongCaiSecondaryIndustryStatisticsResponse {
+
+    private Long id;
+
+    @ApiModelProperty("业务日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8" )
+    private Date businessDate;
+
+    @ApiModelProperty("证券名称")
+    private String securityName;
+
+    @ApiModelProperty("证券代码")
+    private String securityCode;
+
+    @ApiModelProperty("动量排名")
+    private Integer sort;
+
+    @ApiModelProperty("动量排名变化")
+    private Integer sortChange;
+
+    @ApiModelProperty("动量值")
+    @TableField(exist=false)
+    private Integer trendValue;
+
+    @ApiModelProperty("动量值变化")
+    @TableField(exist=false)
+    private Integer trendValueChange;
+
+    @ApiModelProperty("成交额(百万元)")
+    private BigDecimal turnover;
+
+    @ApiModelProperty("成交额变化(百万元)")
+    private BigDecimal turnoverChange;
+
+    @ApiModelProperty("成交额占比")
+    private BigDecimal turnoverRatio;
+
+    @ApiModelProperty("成交额占比(百万元)")
+    private BigDecimal turnoverRatioChange;
+
+    @ApiModelProperty("成交排名")
+    private Integer turnoverSort;
+
+    @ApiModelProperty("成交排名变化")
+    private Integer turnoverSortChange;
+
+    @ApiModelProperty("5日成交额(百万元)")
+    private BigDecimal turnover5;
+
+    @ApiModelProperty("5日成交额变化(百万元)")
+    private BigDecimal turnover5Change;
+
+    @ApiModelProperty("5日成交额占比")
+    private BigDecimal turnover5Ratio;
+
+    @ApiModelProperty("5日成交额占比(百万元)")
+    private BigDecimal turnover5RatioChange;
+
+    @ApiModelProperty("5日成交排名")
+    private Integer turnover5Sort;
+
+    @ApiModelProperty("5日成交排名变化")
+    private Integer turnover5SortChange;
+
+    @ApiModelProperty("10日成交额(百万元)")
+    private BigDecimal turnover10;
+
+    @ApiModelProperty("10日成交额变化(百万元)")
+    private BigDecimal turnover10Change;
+
+    @ApiModelProperty("10日成交额占比")
+    private BigDecimal turnover10Ratio;
+
+    @ApiModelProperty("10日成交额占比(百万元)")
+    private BigDecimal turnover10RatioChange;
+
+    @ApiModelProperty("10日成交排名")
+    private Integer turnover10Sort;
+
+    @ApiModelProperty("10日成交排名变化")
+    private Integer turnoverSort10Change;
+
+    @ApiModelProperty("20日成交额(百万元)")
+    private BigDecimal turnover20;
+
+    @ApiModelProperty("20日成交额变化(百万元)")
+    private BigDecimal turnover20Change;
+
+    @ApiModelProperty("20日成交额占比")
+    private BigDecimal turnover20Ratio;
+
+    @ApiModelProperty("20日成交额占比(百万元)")
+    private BigDecimal turnover20RatioChange;
+
+    @ApiModelProperty("20日成交排名")
+    private Integer turnover20Sort;
+
+    @ApiModelProperty("成交排名变化")
+    private Integer turnover20SortChange;
+
+    @ApiModelProperty("30日成交额(百万元)")
+    private BigDecimal turnover30;
+
+    @ApiModelProperty("30日成交额变化(百万元)")
+    private BigDecimal turnover30Change;
+
+    @ApiModelProperty("30日成交额占比")
+    private BigDecimal turnover30Ratio;
+
+    @ApiModelProperty("30日成交额占比(百万元)")
+    private BigDecimal turnover30RatioChange;
+
+    @ApiModelProperty("30日成交排名")
+    private Integer turnover30Sort;
+
+    @ApiModelProperty("30日成交排名变化")
+    private Integer turnover30SortChange;
+
+    @ApiModelProperty("上涨家数")
+    private String riseNumber;
+    @ApiModelProperty("上涨家数变化")
+    private String riseNumberChange;
+
+    @ApiModelProperty("下跌家数")
+    private String lossesNumber;
+
+    @ApiModelProperty("下跌家数变化")
+    private String lossesNumberChange;
+
+    @ApiModelProperty("平盘家数")
+    private String flatNumber;
+
+    @ApiModelProperty("平盘家数变化")
+    private String flatNumberChange;
+
+    @ApiModelProperty("5日上涨家数")
+    private String rise5Number;
+    @ApiModelProperty("5日上涨家数变化")
+    private String rise5NumberChange;
+
+    @ApiModelProperty("5日下跌家数")
+    private String losses5Number;
+
+    @ApiModelProperty("5日下跌家数")
+    private String losses5NumberChange;
+
+    @ApiModelProperty("5日平盘家数")
+    private String flat5Number;
+
+    @ApiModelProperty("5日平盘家数")
+    private String flat5NumberChange;
+
+    @ApiModelProperty("10日上涨家数")
+    private String rise10Number;
+    @ApiModelProperty("10日上涨家数变化")
+    private String rise10NumberChange;
+
+    @ApiModelProperty("10日下跌家数")
+    private String losses10Number;
+
+    @ApiModelProperty("10日下跌家数")
+    private String losses10NumberChange;
+
+    @ApiModelProperty("10日平盘家数")
+    private String flat10Number;
+
+    @ApiModelProperty("10日平盘家数")
+    private String flat10NumberChange;
+
+    @ApiModelProperty("20日上涨家数")
+    private String rise20Number;
+    @ApiModelProperty("20日上涨家数变化")
+    private String rise20NumberChange;
+
+    @ApiModelProperty("20日下跌家数")
+    private String losses20Number;
+
+    @ApiModelProperty("20日下跌家数")
+    private String losses20NumberChange;
+
+    @ApiModelProperty("20日平盘家数")
+    private String flat20Number;
+
+    @ApiModelProperty("20日平盘家数")
+    private String flat20NumberChange;
+
+    @ApiModelProperty("30日上涨家数")
+    private String rise30Number;
+    @ApiModelProperty("30日上涨家数变化")
+    private String rise30NumberChange;
+
+    @ApiModelProperty("30日下跌家数")
+    private String losses30Number;
+
+    @ApiModelProperty("30日下跌家数")
+    private String losses30NumberChange;
+
+    @ApiModelProperty("30日平盘家数")
+    private String flat30Number;
+
+    @ApiModelProperty("30日平盘家数")
+    private String flat30NumberChange;
+
+    //todo 需要增加 上涨下跌占比
+
+    @ApiModelProperty("板块排名变化")
+    private Integer plateUpOrDown;
+
+    @ApiModelProperty("证券类型")
+    private String securityType;
+
+
+    public Integer getPlateUpOrDown() {
+        if(ObjectUtil.isEmpty(plateUpOrDown)){
+            return 0;
+        }
+        return plateUpOrDown;
+    }
+
+    public Integer getSortChange() {
+        if(ObjectUtil.isEmpty(sortChange)){
+            return 0;
+        }
+        return sortChange;
+    }
+}