From a8d43c9cd831282dd23214c4f9ff27c6d05d6613 Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Mon, 15 Jul 2024 16:52:53 +0800
Subject: [PATCH] 最大代理等级的配置
---
src/main/java/com/nq/enums/EConfigKey.java | 1
src/main/java/com/nq/service/impl/StockConfigServicesImpl.java | 46 ++++++++++++++++++++++
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 32 +++++++++++++++-
3 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nq/enums/EConfigKey.java b/src/main/java/com/nq/enums/EConfigKey.java
index 376f37a..20a1b40 100644
--- a/src/main/java/com/nq/enums/EConfigKey.java
+++ b/src/main/java/com/nq/enums/EConfigKey.java
@@ -5,6 +5,7 @@
LIMIT_UP_POINT("limit_up_point","涨停点位"),
+ LIMIT_UP_INTERVAL("limit_up_interval","涨停点位区间"),
LIMIT_UP_IS_BUY("limit_up_is_buy","涨停是否可以购买"),
LIMIT_DOWN_POINT("limit_down_point","跌停点位"),
diff --git a/src/main/java/com/nq/service/impl/StockConfigServicesImpl.java b/src/main/java/com/nq/service/impl/StockConfigServicesImpl.java
index da25c66..23af9e1 100644
--- a/src/main/java/com/nq/service/impl/StockConfigServicesImpl.java
+++ b/src/main/java/com/nq/service/impl/StockConfigServicesImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nq.common.ServerResponse;
import com.nq.dao.StockConfigMapper;
+import com.nq.enums.EConfigKey;
import com.nq.pojo.StockConfig;
import com.nq.service.IStockConfigServices;
import org.apache.http.util.TextUtils;
@@ -23,9 +24,14 @@
StockConfigMapper stockConfigMapper;
@Override
public ServerResponse updateStockConfig(StockConfig stockConfig) {
+ if(EConfigKey.LIMIT_UP_INTERVAL.getCode().equals(stockConfig.getCKey())){
+ if(!validateRanges(stockConfig.getCValue())){
+ return ServerResponse.createByErrorMsg("格式错误");
+ }
+ }
int ref = stockConfigMapper.updateById(stockConfig);
if(ref>0){
- return ServerResponse.createBySuccess();
+ return ServerResponse.createBySuccessMsg("设置成功");
}
return ServerResponse.createByErrorMsg("设置失败");
}
@@ -62,4 +68,42 @@
return resultMap;
}
+
+ public boolean validateRanges(String ranges) {
+ // 分割逗号分隔的多个范围
+ String[] rangeArray = ranges.split(",");
+
+ // 遍历每个范围进行验证
+ for (String range : rangeArray) {
+ // 定义匹配数字-数字格式的正则表达式
+ String regex = "^\\d+\\.\\d+-\\d+\\.\\d+$";
+
+ // 检查输入的字符串是否符合格式
+ if (range.matches(regex)) {
+ // 进一步检查数字范围的有效性
+ String[] parts = range.split("-");
+ if (parts.length == 2) {
+ try {
+ double start = Double.parseDouble(parts[0]);
+ double end = Double.parseDouble(parts[1]);
+ // 确保start < end
+ if (!(start < end)) {
+ return false;
+ }
+ } catch (NumberFormatException e) {
+ // 如果解析失败，说明不是有效的数字格式
+ return false;
+ }
+ } else {
+ // 如果不是两部分，说明格式不正确
+ return false;
+ }
+ } else {
+ // 如果不匹配正则表达式，说明格式不正确
+ return false;
+ }
+ }
+ // 所有范围验证通过
+ return true;
+ }
}
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 607a4f6..6dd23f5 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -1738,10 +1738,14 @@
BigDecimal pcp = new BigDecimal(stockRealTimeBean.getPcp());
//涨停板配置
//组装需要查询的key
- String[] keysArray = new String[]{"limit_up_point","limit_up_is_buy"};
+ String[] keysArray = new String[]{EConfigKey.LIMIT_UP_INTERVAL.getCode(),EConfigKey.LIMIT_UP_IS_BUY.getCode()};
List<String> keysList = Arrays.asList(keysArray);
Map<String, StockConfig> stockConfigs = stockConfigServices.queryByKeys(keysList);
- if(null != stockConfigs && "1".equals(stockConfigs.get("limit_up_is_buy").getCValue()) && pcp.compareTo(new BigDecimal(stockConfigs.get("limit_up_is_buy").getCValue())) >= 0){
+ if(null != stockConfigs && "1".equals(stockConfigs.get(EConfigKey.LIMIT_UP_IS_BUY.getCode()).getCValue())){
+ //判断区间
+ if(!isInAnyInterval(pcp, stockConfigs.get(EConfigKey.LIMIT_UP_INTERVAL.getCode()).getCValue())){
+ return 0;
+ }
//插入购买申请
UserPurchaseApplication purchaseApplication = new UserPurchaseApplication();
purchaseApplication.setStockCode(stock.getStockCode());
@@ -1770,6 +1774,30 @@
return 0;
}
+ public boolean isInAnyInterval(BigDecimal pcp, String intervals) {
+ if(intervals.indexOf(",")>0){
+ String[] intervalArray = intervals.split(",");
+ for (String interval : intervalArray) {
+ if (isInSingleInterval(pcp, interval.trim())) {
+ return true;
+ }
+ }
+ }else {
+ if (isInSingleInterval(pcp, intervals.trim())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean isInSingleInterval(BigDecimal pcp, String interval) {
+ String[] parts = interval.split("-");
+ BigDecimal start = new BigDecimal(parts[0].trim());
+ BigDecimal end = new BigDecimal(parts[1].trim());
+
+ return pcp.compareTo(start) >= 0 && pcp.compareTo(end) <= 0;
+ }
+
private Result getResult(UserPosition position) {
// 检查订单是否存在
if (position == null) {
--
Gitblit v1.9.3