diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockHighLowStatus.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockHighLowStatus.java
index ec6dc79..e850389 100644
--- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockHighLowStatus.java
+++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/TStockHighLowStatus.java
@@ -30,20 +30,10 @@ public class TStockHighLowStatus extends BaseEntity
@Excel(name = "近期创阶段新高", readConverterExp = "1=是,0=否")
private Integer isNewHigh;
- /** 区间最高价日(创新高时填充) */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "区间最高价日", dateFormat = "yyyy-MM-dd")
- private Date newHighDate;
-
/** 是否创阶段新低(1=是,0=否) */
@Excel(name = "近期创阶段新低", readConverterExp = "1=是,0=否")
private Integer isNewLow;
- /** 区间最低价日(创新低时填充) */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "区间最低价日", dateFormat = "yyyy-MM-dd")
- private Date newLowDate;
-
/** 证券名称(查询时关联获取) */
private String stockName;
@@ -83,16 +73,6 @@ public class TStockHighLowStatus extends BaseEntity
this.isNewHigh = isNewHigh;
}
- public Date getNewHighDate()
- {
- return newHighDate;
- }
-
- public void setNewHighDate(Date newHighDate)
- {
- this.newHighDate = newHighDate;
- }
-
public Integer getIsNewLow()
{
return isNewLow;
@@ -103,16 +83,6 @@ public class TStockHighLowStatus extends BaseEntity
this.isNewLow = isNewLow;
}
- public Date getNewLowDate()
- {
- return newLowDate;
- }
-
- public void setNewLowDate(Date newLowDate)
- {
- this.newLowDate = newLowDate;
- }
-
public String getStockName()
{
return stockName;
@@ -150,9 +120,7 @@ public class TStockHighLowStatus extends BaseEntity
"stockCode='" + stockCode + '\'' +
", tradeDate=" + tradeDate +
", isNewHigh=" + isNewHigh +
- ", newHighDate=" + newHighDate +
", isNewLow=" + isNewLow +
- ", newLowDate=" + newLowDate +
'}';
}
}
diff --git a/newstock-system/src/main/resources/mapper/newstocksystem/StockHighLowStatusMapper.xml b/newstock-system/src/main/resources/mapper/newstocksystem/StockHighLowStatusMapper.xml
index daba656..3b2e03b 100644
--- a/newstock-system/src/main/resources/mapper/newstocksystem/StockHighLowStatusMapper.xml
+++ b/newstock-system/src/main/resources/mapper/newstocksystem/StockHighLowStatusMapper.xml
@@ -7,9 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
@@ -20,13 +18,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select stock_code, trade_date, is_new_high, new_high_date, is_new_low, new_low_date, create_time
+ select stock_code, trade_date, is_new_high, is_new_low, create_time
from t_stock_high_low_status
- select h.stock_code, h.trade_date, h.is_new_high, h.new_high_date, h.is_new_low, h.new_low_date, h.create_time,
- b.stock_name, b.industry_index_code, b.industry_index_name
+ select
+ h.stock_code,
+ h.trade_date,
+ h.is_new_high,
+ h.is_new_low,
+ h.create_time,
+ b.stock_name,
+ b.industry_index_code,
+ b.industry_index_name
from t_stock_high_low_status h
left join t_stock_basic b on h.stock_code = b.stock_code
@@ -126,18 +131,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
stock_code,
trade_date,
is_new_high,
- new_high_date,
is_new_low,
- new_low_date,
create_time,
#{stockCode},
#{tradeDate},
#{isNewHigh},
- #{newHighDate},
#{isNewLow},
- #{newLowDate},
NOW(),
@@ -146,9 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_stock_high_low_status
is_new_high = #{isNewHigh},
- new_high_date = #{newHighDate},
is_new_low = #{isNewLow},
- new_low_date = #{newLowDate},
where stock_code = #{stockCode} and trade_date = #{tradeDate}
@@ -158,23 +157,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- insert into t_stock_high_low_status(stock_code, trade_date, is_new_high, new_high_date, is_new_low, new_low_date, create_time)
+ insert into t_stock_high_low_status(stock_code, trade_date, is_new_high, is_new_low, create_time)
values
- (#{item.stockCode}, #{item.tradeDate}, #{item.isNewHigh}, #{item.newHighDate}, #{item.isNewLow}, #{item.newLowDate}, NOW())
+ (#{item.stockCode}, #{item.tradeDate}, #{item.isNewHigh}, #{item.isNewLow}, NOW())
- insert into t_stock_high_low_status(stock_code, trade_date, is_new_high, new_high_date, is_new_low, new_low_date, create_time)
+ insert into t_stock_high_low_status(stock_code, trade_date, is_new_high, is_new_low, create_time)
values
- (#{item.stockCode}, #{item.tradeDate}, #{item.isNewHigh}, #{item.newHighDate}, #{item.isNewLow}, #{item.newLowDate}, NOW())
+ (#{item.stockCode}, #{item.tradeDate}, #{item.isNewHigh}, #{item.isNewLow}, NOW())
ON DUPLICATE KEY UPDATE
is_new_high = VALUES(is_new_high),
- new_high_date = VALUES(new_high_date),
- is_new_low = VALUES(is_new_low),
- new_low_date = VALUES(new_low_date)
+ is_new_low = VALUES(is_new_low)
diff --git a/sql_refacor0120/remove_new_high_low_date_fields.sql b/sql_refacor0120/remove_new_high_low_date_fields.sql
new file mode 100644
index 0000000..44f7140
--- /dev/null
+++ b/sql_refacor0120/remove_new_high_low_date_fields.sql
@@ -0,0 +1,9 @@
+-- 移除个股新高新低状态表中的冗余日期字段
+-- 根据业务需求,新高新低的实际日期可以通过tradeDate和isNewHigh/isNewLow字段组合确定
+
+ALTER TABLE `t_stock_high_low_status`
+DROP COLUMN `new_high_date`,
+DROP COLUMN `new_low_date`;
+
+-- 更新表注释
+ALTER TABLE `t_stock_high_low_status` COMMENT = 'A股个股300天新高新低状态(new_high_date和new_low_date字段已移除,实际日期由tradeDate和isNewHigh/isNewLow字段组合确定)';
\ No newline at end of file
diff --git a/sql_refacor0120/t_stock_high_low_status.sql b/sql_refacor0120/t_stock_high_low_status.sql
index dda7f5c..4336d19 100644
--- a/sql_refacor0120/t_stock_high_low_status.sql
+++ b/sql_refacor0120/t_stock_high_low_status.sql
@@ -3,9 +3,7 @@ CREATE TABLE `t_stock_high_low_status` (
`stock_code` VARCHAR(20) NOT NULL COMMENT '证券代码(关联t_stock_basic)',
`trade_date` DATE NOT NULL COMMENT '交易日期',
`is_new_high` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否创阶段新高(1=是,0=否)',
- `new_high_date` DATE NULL COMMENT '区间最高价日(创新高时填充)',
`is_new_low` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否创阶段新低(1=是,0=否)',
- `new_low_date` DATE NULL COMMENT '区间最低价日(创新低时填充)',
`create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '数据创建时间',
-- 复合主键:确保“个股代码+日期”唯一
PRIMARY KEY (`stock_code`, `trade_date`),