From c8bc2231dbaac39dcc8c49acd5ade8cde33e5667 Mon Sep 17 00:00:00 2001
From: laixingyu <xingyu.lai@suwell.cn>
Date: Wed, 9 Aug 2023 14:51:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DongCaiSecondaryIndustryMapper.xml | 18 +++--
 .../pojo/domain/DongCaiSecondaryIndustry.java | 67 ++++++++++++++++++-
 .../DongCaiSecondaryIndustryResponse.java     | 57 +++++++++++++++-
 3 files changed, 133 insertions(+), 9 deletions(-)

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 4e29f1e..80f1a7a 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
@@ -85,11 +85,11 @@
 <!--        </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,
+        select ds.business_date as businessDate, ds.security_name 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,
         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,
@@ -99,11 +99,15 @@
         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)
-        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}
+        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,
+        ds.sort as sort,ds.sort_change as sortChange,ds.trend_value as trendValue,ds.trend_value_change as trendValueChange,
+        ds.sort5 as sort5,ds.sort5_change as sort5Change,ds.trend5_value as trend5Value,ds.trend5_value_change as trend5ValueChange,
+        ds.sort10 as sort10,ds.sort10_change as sort10Change,ds.trend10_value as trend10Value,ds.trend10_value_change as trend10ValueChange,
+        ds.sort20 as sort20,ds.sort20_change as sort20Change,ds.trend20_value as trend20Value,ds.trend20_value_change as trend20ValueChange,
+        ds.sort30 as sort30,ds.sort30_change as sort30Change,ds.trend30_value as trend30Value,ds.trend30_value_change as trend30ValueChange
+        from dong_cai_secondary_industry d
+        left join dong_cai_secondary_industry_statistics ds on (d.security_name = ds.security_name)
+        where d.business_date = #{firstDate}  and ds.business_date = #{firstDate} and ds.sort > 0
         <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 9e2b165..0cdbf4f 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
@@ -65,6 +65,15 @@ public class DongCaiSecondaryIndustry {
     @ExcelProperty(index = 6)
     private BigDecimal turnover;
 
+    @ApiModelProperty("成交额变化(百万元)")
+    private BigDecimal turnoverChange;
+
+    @ApiModelProperty("成交额占比")
+    private BigDecimal turnoverRatio;
+
+    @ApiModelProperty("成交额占比(百万元)")
+    private BigDecimal turnoverRatioChange;
+
     @ApiModelProperty("总市值(百万元)")
     @ExcelProperty(index = 7)
     private BigDecimal totalCapitalization;
@@ -137,6 +146,62 @@ public class DongCaiSecondaryIndustry {
     @TableField(exist=false)
     private Integer trendValueChange;
 
+    @ApiModelProperty("5日动量排名")
+    private Integer sort5;
+
+    @ApiModelProperty("5日动量排名变化")
+    private Integer sort5Change;
+
+    @ApiModelProperty("5日动量值")
+    @TableField(exist=false)
+    private Integer trend5Value;
+
+    @ApiModelProperty("5日动量值变化")
+    @TableField(exist=false)
+    private Integer trend5ValueChange;
+
+    @ApiModelProperty("10日动量排名")
+    private Integer sort10;
+
+    @ApiModelProperty("10日动量排名变化")
+    private Integer sort10Change;
+
+    @ApiModelProperty("10日动量值")
+    @TableField(exist=false)
+    private Integer trend10Value;
+
+    @ApiModelProperty("10日动量值变化")
+    @TableField(exist=false)
+    private Integer trend10ValueChange;
+
+    @ApiModelProperty("20日动量排名")
+    private Integer sort20;
+
+    @ApiModelProperty("20日动量排名变化")
+    private Integer sort20Change;
+
+    @ApiModelProperty("20日动量值")
+    @TableField(exist=false)
+    private Integer trend20Value;
+
+    @ApiModelProperty("20日动量值变化")
+    @TableField(exist=false)
+    private Integer trend20ValueChange;
+
+    @ApiModelProperty("30日动量排名")
+    private Integer sort30;
+
+    @ApiModelProperty("30日动量排名变化")
+    private Integer sort30Change;
+
+    @ApiModelProperty("30日动量值")
+    @TableField(exist=false)
+    private Integer trend30Value;
+
+    @ApiModelProperty("30日动量值变化")
+    @TableField(exist=false)
+    private Integer trend30ValueChange;
+
     @ApiModelProperty("成交排名")
     private Integer turnoverSort;
 
@@ -177,7 +242,7 @@ public class DongCaiSecondaryIndustry {
     private Integer turnover10Sort;
 
     @ApiModelProperty("10日成交排名变化")
-    private Integer turnoverSort10Change;
+    private Integer turnover10SortChange;
 
     @ApiModelProperty("20日成交额(百万元)")
     private BigDecimal turnover20;
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 65a21ed..9f209a4 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
@@ -47,6 +47,61 @@ public class DongCaiSecondaryIndustryResponse {
     @ApiModelProperty("动量值变化")
     @TableField(exist=false)
     private Integer trendValueChange;
+    @ApiModelProperty("5日动量排名")
+    private Integer sort5;
+
+    @ApiModelProperty("5日动量排名变化")
+    private Integer sort5Change;
+
+    @ApiModelProperty("5日动量值")
+    @TableField(exist=false)
+    private Integer trend5Value;
+
+    @ApiModelProperty("5日动量值变化")
+    @TableField(exist=false)
+    private Integer trend5ValueChange;
+
+    @ApiModelProperty("10日动量排名")
+    private Integer sort10;
+
+    @ApiModelProperty("10日动量排名变化")
+    private Integer sort10Change;
+
+    @ApiModelProperty("10日动量值")
+    @TableField(exist=false)
+    private Integer trend10Value;
+
+    @ApiModelProperty("10日动量值变化")
+    @TableField(exist=false)
+    private Integer trend10ValueChange;
+
+    @ApiModelProperty("20日动量排名")
+    private Integer sort20;
+
+    @ApiModelProperty("20日动量排名变化")
+    private Integer sort20Change;
+
+    @ApiModelProperty("20日动量值")
+    @TableField(exist=false)
+    private Integer trend20Value;
+
+    @ApiModelProperty("20日动量值变化")
+    @TableField(exist=false)
+    private Integer trend20ValueChange;
+
+    @ApiModelProperty("30日动量排名")
+    private Integer sort30;
+
+    @ApiModelProperty("30日动量排名变化")
+    private Integer sort30Change;
+
+    @ApiModelProperty("30日动量值")
+    @TableField(exist=false)
+    private Integer trend30Value;
+
+    @ApiModelProperty("30日动量值变化")
+    @TableField(exist=false)
+    private Integer trend30ValueChange;
 
     @ApiModelProperty("成交额(百万元)")
     private BigDecimal turnover;
@@ -100,7 +155,7 @@ public class DongCaiSecondaryIndustryResponse {
     private Integer turnover10Sort;
 
     @ApiModelProperty("10日成交排名变化")
-    private Integer turnoverSort10Change;
+    private Integer turnover10SortChange;
 
     @ApiModelProperty("20日成交额(百万元)")
     private BigDecimal turnover20;