diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index fc5c513..380872d 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,8 +6,8 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# url: jdbc:mysql://192.168.0.222:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.0.222:3306/ry_refactor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 1qazse42W3
# 从库数据源
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b08a9d0..ac23a28 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -61,14 +61,14 @@ spring:
enabled: true
# redis 配置
redis:
- # 地址
- host: localhost
- # 端口，默认为6379
- port: 6379
# # 地址
-# host: 192.168.0.222
+# host: localhost
# # 端口，默认为6379
-# port: 6380
+# port: 6379
+ # 地址
+ host: 192.168.0.222
+ # 端口，默认为6379
+ port: 6380
# 数据库索引
database: 0
# 密码
diff --git a/ruoyi-ui/src/views/stocksystem/stocks/index.vue b/ruoyi-ui/src/views/stocksystem/stocks/index.vue
index 5c9c8de..f4757dc 100644
--- a/ruoyi-ui/src/views/stocksystem/stocks/index.vue
+++ b/ruoyi-ui/src/views/stocksystem/stocks/index.vue
@@ -246,6 +246,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -319,6 +329,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -554,6 +594,16 @@ export default {
differrange10: null,
differrange20: null,
differrange60: null,
+ differrange3: null,
+ differrange5: null,
+ differrange15: null,
+ differrange30: null,
+ backdifferrange10: null,
+ backdifferrange20: null,
+ backdifferrange60: null,
+ isHigh: null,
+ isLow: null,
+ sort: null,
avgVolume20: null,
freefloatMarketValue: null,
totalMarketValue: null,
diff --git a/stock-system/src/main/java/com/ruoyi/stocksystem/controller/StocksController.java b/stock-system/src/main/java/com/ruoyi/stocksystem/controller/StocksController.java
index 1baf9cd..a8363bd 100644
--- a/stock-system/src/main/java/com/ruoyi/stocksystem/controller/StocksController.java
+++ b/stock-system/src/main/java/com/ruoyi/stocksystem/controller/StocksController.java
@@ -959,7 +959,7 @@ public class StocksController extends BaseController
break;
}
}
- stocksService.insertStocksTmp(stocks1);
+ stocksService.insertStocks(stocks1);
}
}
System.out.println("testAnalysis finished.");
@@ -1033,7 +1033,7 @@ public class StocksController extends BaseController
break;
}
}
- stocksService.insertStocksTmp(stocks1);
+ stocksService.insertStocks(stocks1);
}
System.out.println("testAnalysis finished.");
}
diff --git a/stock-system/src/main/java/com/ruoyi/stocksystem/domain/Stocks.java b/stock-system/src/main/java/com/ruoyi/stocksystem/domain/Stocks.java
index a6e3c56..33232bb 100644
--- a/stock-system/src/main/java/com/ruoyi/stocksystem/domain/Stocks.java
+++ b/stock-system/src/main/java/com/ruoyi/stocksystem/domain/Stocks.java
@@ -124,6 +124,30 @@ public class Stocks extends BaseEntity
@Excel(name = "是否跌停")
private String isdrop;
+ /** 是否300天新高 */
+ @Excel(name = "近期创阶段新高")
+ private String isHigh;
+
+ /** 是否300天新低 */
+ @Excel(name = "近期创阶段新低")
+ private String isLow;
+
+ /** 10日区间最大回撤 */
+ @Excel(name = "10日区间最大回撤")
+ private BigDecimal backdifferrange10;
+
+ /** 20日区间最大回撤 */
+ @Excel(name = "20日区间最大回撤")
+ private BigDecimal backdifferrange20;
+
+ /** 60日区间最大回撤 */
+ @Excel(name = "60日区间最大回撤")
+ private BigDecimal backdifferrange60;
+
+ /** 排名 */
+ @Excel(name = "排名")
+ private Long sort;
+
private int blemindCount;
/** 扩展字段1，查询板块数据是，板块内数量 */
@@ -302,6 +326,63 @@ public class Stocks extends BaseEntity
{
return isdrop;
}
+
+ public void setIsHigh(String isHigh)
+ {
+ this.isHigh = isHigh;
+ }
+
+ public String getIsHigh()
+ {
+ return isHigh;
+ }
+
+ public void setIsLow(String isLow)
+ {
+ this.isLow = isLow;
+ }
+
+ public String getIsLow()
+ {
+ return isLow;
+ }
+
+ public void setBackdifferrange10(BigDecimal backdifferrange10)
+ {
+ this.backdifferrange10 = backdifferrange10;
+ }
+ public BigDecimal getBackdifferrange10()
+ {
+ return backdifferrange10;
+ }
+
+ public void setBackdifferrange20(BigDecimal backdifferrange20)
+ {
+ this.backdifferrange20 = backdifferrange20;
+ }
+ public BigDecimal getBackdifferrange20()
+ {
+ return backdifferrange20;
+ }
+
+ public void setBackdifferrange60(BigDecimal backdifferrange60)
+ {
+ this.backdifferrange60 = backdifferrange60;
+ }
+ public BigDecimal getBackdifferrange60()
+ {
+ return backdifferrange60;
+ }
+
+ public void setSort(Long sort)
+ {
+ this.sort = sort;
+ }
+ public Long getSort()
+ {
+ return sort;
+ }
+
public void setDifferrange(BigDecimal differrange)
{
this.differrange = differrange;
@@ -516,10 +597,18 @@ public class Stocks extends BaseEntity
.append("differrange5", getDifferrange5())
.append("differrange15", getDifferrange15())
.append("differrange30", getDifferrange30())
+ .append("backdifferrange10", getBackdifferrange10())
+ .append("backdifferrange20", getBackdifferrange20())
+ .append("backdifferrange60", getBackdifferrange60())
.append("avgVolume20", getAvgVolume20())
.append("freefloatMarketValue", getFreefloatMarketValue())
.append("totalMarketValue", getTotalMarketValue())
.append("agenciesHold", getAgenciesHold())
+ .append("islimit", getIslimit())
+ .append("isdrop", getIsdrop())
+ .append("isHigh", getIsHigh())
+ .append("isLow", getIsLow())
+ .append("sort", getSort())
.append("stockBasicList", getStockBasicList())
.toString();
}
diff --git a/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/IStocksService.java b/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/IStocksService.java
index be16c27..26a92b1 100644
--- a/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/IStocksService.java
+++ b/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/IStocksService.java
@@ -86,13 +86,7 @@ public interface IStocksService
*/
public int insertStocks(Stocks stocks);
- /**
- * 新增行情数据,辅助计算涨跌幅
- *
- * @param stocks 行情数据
- * @return 结果
- */
- public int insertStocksTmp(Stocks stocks);
+
/**
* 修改行情数据
diff --git a/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/impl/StocksServiceImpl.java b/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/impl/StocksServiceImpl.java
index 8fbd1a5..2a1bf1f 100644
--- a/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/impl/StocksServiceImpl.java
+++ b/stock-system/src/main/java/com/ruoyi/stocksystem/domain/service/impl/StocksServiceImpl.java
@@ -162,22 +162,6 @@ public class StocksServiceImpl implements IStocksService
return rows;
}
- /**
- * 新增行情数据,辅助计算涨跌幅
- *
- * @param stocks 行情数据
- * @return 结果
- */
- @Transactional
- @Override
- public int insertStocksTmp(Stocks stocks)
- {
- int rows = stocksMapper.insertStocksTmp(stocks);
- //todo 需要更新基础数据
-// insertStockBasic(stocks);
- return rows;
- }
-
/**
* 修改行情数据
*
@@ -399,6 +383,7 @@ public class StocksServiceImpl implements IStocksService
//已存在，不进行操作
failureNum++;
failureMsg.append("
" + failureNum + "、股票代码 " + stocks.getCode() + " 已存在");
+
}
}
catch (Exception e)
@@ -449,8 +434,8 @@ public class StocksServiceImpl implements IStocksService
stocks.setTradeDay(tradeDay);
this.insertStocks(stocks);
successNum++;
- System.out.println("
" + successNum + "、股票代码 " + stocks.getCode() + " 导入成功");
- successMsg.append("
" + successNum + "、股票代码 " + stocks.getCode() + " 导入成功");
+ System.out.println("
", + successNum + "、股票代码 " + stocks.getCode() + " 导入成功");
+ successMsg.append("
", + successNum + "、股票代码 " + stocks.getCode() + " 导入成功");
}
else if (isUpdateSupport)
{
@@ -459,19 +444,19 @@ public class StocksServiceImpl implements IStocksService
// user.setUpdateBy(operName);
// this.updateUser(user);
// successNum++;
-// successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功");
+// successMsg.append("
", + successNum + "、账号 " + user.getUserName() + " 更新成功");
}
else
{
//已存在，不进行操作
failureNum++;
- failureMsg.append("
" + failureNum + "、股票代码 " + stocks.getCode() + " 已存在");
+ failureMsg.append("
", + failureNum + "、股票代码 " + stocks.getCode() + " 已存在");
}
}
catch (Exception e)
{
failureNum++;
- String msg = "
" + failureNum + "、股票代码 " + stocks.getCode() + " 导入失败：";
+ String msg = "
", + failureNum + "、股票代码 " + stocks.getCode() + " 导入失败：";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}*/
@@ -581,4 +566,4 @@ public class StocksServiceImpl implements IStocksService
{
return stocksMapper.selectStockIndexsDataForQuery(stocks);
}
-}
+}
\ No newline at end of file
diff --git a/stock-system/src/main/java/com/ruoyi/stocksystem/mapper/StocksMapper.java b/stock-system/src/main/java/com/ruoyi/stocksystem/mapper/StocksMapper.java
index b9305f1..43f2b44 100644
--- a/stock-system/src/main/java/com/ruoyi/stocksystem/mapper/StocksMapper.java
+++ b/stock-system/src/main/java/com/ruoyi/stocksystem/mapper/StocksMapper.java
@@ -94,13 +94,7 @@ public interface StocksMapper
*/
public int insertStocks(Stocks stocks);
- /**
- * 新增行情数据,辅助计算涨跌幅
- *
- * @param stocks 行情数据
- * @return 结果
- */
- public int insertStocksTmp(Stocks stocks);
+
/**
* 修改行情数据
diff --git a/stock-system/src/main/resources/mapper/stocksystem/StocksInTrendMapper.xml b/stock-system/src/main/resources/mapper/stocksystem/StocksInTrendMapper.xml
index 7ff7e11..dbd2e0d 100644
--- a/stock-system/src/main/resources/mapper/stocksystem/StocksInTrendMapper.xml
+++ b/stock-system/src/main/resources/mapper/stocksystem/StocksInTrendMapper.xml
@@ -56,64 +56,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
- insert into stocks_in_trend
-
- code,
- trade_day,
- sort,
- type,
-
-
- #{code},
- #{tradeDay},
- #{sort},
- #{type},
-
-
+
-
- update stocks_in_trend
-
- code = #{code},
- trade_day = #{tradeDay},
- sort = #{sort},
- type = #{type},
-
- where id = #{id}
-
+
-
- delete from stocks_in_trend where id = #{id}
-
+
-
- delete from stocks_in_trend where id in
-
- #{id}
-
-
+
\ No newline at end of file
diff --git a/stock-system/src/main/resources/mapper/stocksystem/StocksLimitMapper.xml b/stock-system/src/main/resources/mapper/stocksystem/StocksLimitMapper.xml
index 587b85d..84f5962 100644
--- a/stock-system/src/main/resources/mapper/stocksystem/StocksLimitMapper.xml
+++ b/stock-system/src/main/resources/mapper/stocksystem/StocksLimitMapper.xml
@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, code, trade_day, islimit, isdrop from stocks_limit
+ select id, code, trade_day, islimit, isdrop from stocks
-
-
- insert into stocks_limit
-
- code,
- trade_day,
- islimit,
- isdrop,
-
-
- #{code},
- #{tradeDay},
- #{islimit},
- #{isdrop},
-
-
-
- update stocks_limit
-
- code = #{code},
- trade_day = #{tradeDay},
- islimit = #{islimit},
- isdrop = #{isdrop},
-
- where id = #{id}
-
-
-
- delete from stocks_limit where id = #{id}
-
-
-
- delete from stocks_limit where id in
-
- #{id}
-
-
-
-
-->
@@ -162,6 +165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
low,
islimit,
isdrop,
+ isHigh,
+ isLow,
differrange,
trade_days,
volumn,
@@ -169,6 +174,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
differrange10,
differrange20,
differrange60,
+ differrange3,
+ differrange5,
+ differrange15,
+ differrange30,
+ backdifferrange10,
+ backdifferrange20,
+ backdifferrange60,
+ sort,
avg_volume20,
freefloat_market_value,
total_market_value,
@@ -183,6 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{low},
#{islimit},
#{isdrop},
+ #{isHigh},
+ #{isLow},
#{differrange},
#{tradeDays},
#{volumn},
@@ -190,6 +205,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{differrange10},
#{differrange20},
#{differrange60},
+ #{differrange3},
+ #{differrange5},
+ #{differrange15},
+ #{differrange30},
+ #{backdifferrange10},
+ #{backdifferrange20},
+ #{backdifferrange60},
+ #{sort},
#{avgVolume20},
#{freefloatMarketValue},
#{totalMarketValue},
@@ -208,6 +231,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
low = #{low},
islimit = #{islimit},
isdrop = #{isdrop},
+ isHigh = #{isHigh},
+ isLow = #{isLow},
differrange = #{differrange},
trade_days = #{tradeDays},
volumn = #{volumn},
@@ -215,6 +240,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
differrange10 = #{differrange10},
differrange20 = #{differrange20},
differrange60 = #{differrange60},
+ differrange3 = #{differrange3},
+ differrange5 = #{differrange5},
+ differrange15 = #{differrange15},
+ differrange30 = #{differrange30},
+ backdifferrange10 = #{backdifferrange10},
+ backdifferrange20 = #{backdifferrange20},
+ backdifferrange60 = #{backdifferrange60},
+ sort = #{sort},
avg_volume20 = #{avgVolume20},
freefloat_market_value = #{freefloatMarketValue},
total_market_value = #{totalMarketValue},
@@ -341,25 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
- insert into stocks_tmp
-
- code,
- trade_day,
- differrange3,
- differrange5,
- differrange15,
- differrange30,
-
-
- #{code},
- #{tradeDay},
- #{differrange3},
- #{differrange5},
- #{differrange15},
- #{differrange30},
-
-
+