Compare commits

..

No commits in common. 'dev' and 'master' have entirely different histories.
dev ... master

@ -45,14 +45,6 @@ public class StockController {
return ok(dongCaiSecondaryIndustryService.trendPlate(dongCaiSecondaryIndustryRequest));
}
@PostMapping(value = "/trends")
@ApiOperation("动量趋势板块")
public Result<PageList<DongCaiSecondaryIndustryResponse>> trends(@RequestBody DongCaiSecondaryIndustryRequest dongCaiSecondaryIndustryRequest) {
return ok(dongCaiSecondaryIndustryService.trends(dongCaiSecondaryIndustryRequest));
}
@PostMapping(value = "/riseLossesStatistics")
@ApiOperation("首页-涨跌统计")

@ -16,7 +16,7 @@ public interface DongCaiSecondaryIndustryMapper extends BaseMapper<DongCaiSecond
/**
*
*
* @param pageInfo
* @param firstDate
* @param secondDate
@ -29,18 +29,5 @@ public interface DongCaiSecondaryIndustryMapper extends BaseMapper<DongCaiSecond
@Param("sortSort") String sortSort,
@Param("sortChangeSort")String sortChangeSort);
/**
* ()
* @param pageInfo
* @param firstDate
* @param secondDate
* @param sortSort
* @param sortChangeSort
*/
Page<DongCaiSecondaryIndustry> trends(@Param("page") Page<PageModel> pageInfo,
@Param("firstDate")Date firstDate,
@Param("secondDate")Date secondDate,
@Param("sortSort") String sortSort,
@Param("sortChangeSort")String sortChangeSort,
@Param("type")String type);
}

@ -44,83 +44,4 @@
</select>
<!--
趋势板块查询trends
* @param pageInfo 分页
* @param firstDate 第一个日期
* @param secondDate 第二个日期
* @param sortSort 排序的排序
* @param sortChangeSort 排序变化的排序
* @param type 趋势类型 1日 10日 15日 20日 30日
Page<DongCaiSecondaryIndustry> trends(@Param("page") Page<PageModel> pageInfo,
@Param("firstDate")Date firstDate,
@Param("secondDate")Date secondDate,
@Param("sortSort") String sortSort,
@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 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,
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,
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.sort10 > 0
<choose>
<when test="sortSort != null and sortSort.trim() != '' and sortChangeSort != null and sortChangeSort.trim() != ''">
order by (sort10+0) ${sortSort},(sort10Change+0) ${sortChangeSort}
</when>
<otherwise>
<if test="sortSort != null and sortSort.trim() != '' ">
order by (sort10+0) ${sortSort}
</if>
<if test="sortChangeSort != null and sortChangeSort.trim() != ''">
order by (sort10Change+0) ${sortChangeSort}
</if>
</otherwise>
</choose>
</select>
</mapper>

@ -65,15 +65,6 @@ 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;
@ -138,221 +129,4 @@ public class DongCaiSecondaryIndustry {
@TableField(exist=false)
private Integer sortChange;
@ApiModelProperty("动量值")
@TableField(exist=false)
private Integer trendValue;
@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 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 turnover10SortChange;
@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;
}

@ -3,14 +3,12 @@ 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;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -28,260 +26,20 @@ public class DongCaiSecondaryIndustryResponse {
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8" )
private Date businessDate;
@ApiModelProperty("证券名称")
private String securityName;
@ApiModelProperty("证券代码")
private String securityCode;
@ApiModelProperty("动量排名")
@ApiModelProperty("排名")
private Integer sort;
@ApiModelProperty("动量排名变化")
private Integer sortChange;
@ApiModelProperty("动量值")
@TableField(exist=false)
private Integer trendValue;
@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;
@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 turnover10SortChange;
@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("板块排名变化")
private Integer plateUpOrDown;
@ApiModelProperty("30日平盘家数")
private String flat30NumberChange;
@ApiModelProperty("排名变化")
private Integer sortChange;
//todo 需要增加 上涨下跌占比
@ApiModelProperty("证券代码")
private String securityCode;
@ApiModelProperty("板块排名变化")
private Integer plateUpOrDown;
@ApiModelProperty("证券名称")
private String securityName;
@ApiModelProperty("证券类型")
private String securityType;

@ -1,244 +0,0 @@
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;
}
}

@ -32,14 +32,6 @@ public interface DongCaiSecondaryIndustryService extends IService<DongCaiSeconda
*/
PageList<DongCaiSecondaryIndustryResponse> trendPlate(DongCaiSecondaryIndustryRequest dongCaiSecondaryIndustryRequest);
/**
*
*
* @param dongCaiSecondaryIndustryRequest
* @return
*/
PageList<DongCaiSecondaryIndustryResponse> trends(DongCaiSecondaryIndustryRequest dongCaiSecondaryIndustryRequest);
/**
*
* @param securityCode code

@ -191,102 +191,7 @@ public class DongCaiSecondaryIndustryServiceImpl extends ServiceImpl<DongCaiSeco
return PageUtils.pageList((int)resultPage.getCurrent(),(int)resultPage.getSize(),(int)resultPage.getTotal(),collect);
}
public PageList<DongCaiSecondaryIndustryResponse> trends(DongCaiSecondaryIndustryRequest dongCaiSecondaryIndustryRequest){
System.out.println("========= trends ============= "+dongCaiSecondaryIndustryRequest.getBusinessDate());
// 分页
Page<DongCaiSecondaryIndustry> page = Querys.page(dongCaiSecondaryIndustryRequest.getPageModel());
// 类型
Integer trendType = 1;
if(ObjectUtil.isNotEmpty(dongCaiSecondaryIndustryRequest.getTrendType()) && dongCaiSecondaryIndustryRequest.getTrendType() > 0){
trendType = dongCaiSecondaryIndustryRequest.getTrendType();
}
if(ObjectUtil.isEmpty(dongCaiSecondaryIndustryRequest.getBusinessDate())){
dongCaiSecondaryIndustryRequest.setBusinessDate(DateUtil.parseDate(DateUtil.now()));
}
System.out.println("========= trends1 ============= "+dongCaiSecondaryIndustryRequest.getBusinessDate());
// 查询最后的日期
LambdaQueryWrapper<DongCaiSecondaryIndustry> queryWrapper = new LambdaQueryWrapper<DongCaiSecondaryIndustry>()
.select(DongCaiSecondaryIndustry::getBusinessDate)
.le(DongCaiSecondaryIndustry::getBusinessDate,dongCaiSecondaryIndustryRequest.getBusinessDate())
.groupBy(DongCaiSecondaryIndustry::getBusinessDate)
.orderByDesc(DongCaiSecondaryIndustry::getBusinessDate).last("limit " + trendType);
List<DongCaiSecondaryIndustry> dongCaiSecondaryIndustryList = list(queryWrapper);
Date firstDate = null;
Date secondDate = null;
//当指定具体日期时查出来的size为1此时如果存在传入参数则应该用传入参数
if(dongCaiSecondaryIndustryList.size() > 1){
firstDate = dongCaiSecondaryIndustryList.get(0).getBusinessDate();
}
else{
firstDate = dongCaiSecondaryIndustryRequest.getBusinessDate();
}
if(dongCaiSecondaryIndustryList.size() > 2) {
secondDate = dongCaiSecondaryIndustryList.get(dongCaiSecondaryIndustryList.size() - 1).getBusinessDate();
}
String sortField = dongCaiSecondaryIndustryRequest.getPageModel().getSortField();
String sortWay = dongCaiSecondaryIndustryRequest.getPageModel().getSortWay();
// 排名的排序
String sort = null;
// 排名变化的排序
String sortChange = null;
if(ObjectUtil.isNotEmpty(sortField)){
String[] sortFieldArr = sortField.split(",");
String[] sortWayArr = sortWay.split(",");
for (int i = 0; i < sortFieldArr.length; i++) {
String s = sortFieldArr[i];
if("sort".equals(s)){
try{
sort = sortWayArr[i];
}catch (Exception e){
sort = "desc";
}
}
if("sortChange".equals(s)){
try{
sortChange = sortWayArr[i];
}catch (Exception e){
sortChange = "desc";
}
}
}
}
Page<DongCaiSecondaryIndustry> resultPage = baseMapper.trends(new Page<>(dongCaiSecondaryIndustryRequest.getPageModel().getPageNo(),
dongCaiSecondaryIndustryRequest.getPageModel().getPageSize()),
firstDate,
secondDate,
sort,
sortChange,
trendType.toString());
List<DongCaiSecondaryIndustryResponse> collect = resultPage.getRecords().stream().map(dongCaiSecondaryIndustry ->
BeanUtil.toBean(dongCaiSecondaryIndustry, DongCaiSecondaryIndustryResponse.class)
).collect(Collectors.toList());
return PageUtils.pageList((int)resultPage.getCurrent(),(int)resultPage.getSize(),(int)resultPage.getTotal(),collect);
}
@Override
public OriginalIssueStockSortResponseChange dongCaiSortChange(String securityCode) {

@ -108,12 +108,11 @@ public class OriginalIssueStockServiceImpl extends ServiceImpl<OriginalIssueStoc
@Override
public BigStockDataResponse riseLossesStatistics(UserCache userCache, OriginalIssueStockRequest originalIssueStockRequest) {
System.out.println("========= riseLossesStatistics ============= "+originalIssueStockRequest.getBusinessDate());
if (ObjectUtil.isEmpty(originalIssueStockRequest.getBusinessDate())) {
originalIssueStockRequest.setBusinessDate(DateUtil.parseDate(DateUtil.now()));
}
System.out.println("========= riseLossesStatistics2 ============= "+originalIssueStockRequest.getBusinessDate());
BigStockDataResponse response = new BigStockDataResponse();
List<String> asList = Arrays.asList(">=10%", ">=7%", "7-5%", "5-3%", "3-0%", "平", "0至-3%", "-3至-5%", "-5至-7%", "<=-7%", "<=-10%");
response.setXAxis(asList);
@ -130,9 +129,8 @@ public class OriginalIssueStockServiceImpl extends ServiceImpl<OriginalIssueStoc
AtomicInteger equalNum = new AtomicInteger(0);
// 查询当前日期的所有数据
// LambdaQueryWrapper<OriginalIssueStock> wrapper = Querys.wrapper(originalIssueStockRequest, OriginalIssueStock.class);
// List<OriginalIssueStock> list = list(wrapper);
List<OriginalIssueStock> list = new ArrayList<>();
LambdaQueryWrapper<OriginalIssueStock> wrapper = Querys.wrapper(originalIssueStockRequest, OriginalIssueStock.class);
List<OriginalIssueStock> list = list(wrapper);
// 分类统计
list.forEach(originalIssueStock -> {

@ -20,8 +20,4 @@ public class UserSmsCodeLoginDTO extends LoginBaseDTO implements Serializable {
@ApiModelProperty(value="手机号",example = "13500000000")
@Phone
private String phone;
@ApiModelProperty(value="密码",example = "123456")
@Phone
private String smsCode;
}

@ -1,8 +1,6 @@
spring:
datasource:
#正式环境正式数据库gupiao正式环境测试数据库mojin
# url: jdbc:mysql://124.223.98.178:3306/gupiao?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&autoReconnect=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://124.223.98.178:3306/mojin?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&autoReconnect=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://124.223.98.178:3306/gupiao?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&autoReconnect=true&serverTimezone=Asia/Shanghai
# url: jdbc:mysql://localhost:3306/gupiao?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&autoReconnect=true&serverTimezone=Asia/Shanghai
username: root
# password: admin

@ -2,7 +2,6 @@ spring:
main:
allow-circular-references: true
profiles:
#prod正式环境 dev测试环境 也可以启动时指定环境(在命令行参数)
# active: prod
active: dev
servlet:

Loading…
Cancel
Save