From e1118a78428ac45085396abb7b5d6e7085dd0518 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sun, 11 Jan 2026 16:45:43 +0800
Subject: [PATCH] 1.11文档修改
---
src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java | 20 +++---
src/main/resources/application.properties | 20 +-----
src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java | 16 ++--
src/main/java/com/nq/service/impl/StockDzServiceImpl.java | 11 +--
src/main/java/com/nq/controller/protol/UserController.java | 1
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 96 ++++++++++++++++----------------
6 files changed, 76 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index b0ede84..2a74f6a 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -319,7 +319,6 @@
@ResponseBody
public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {
// String path = request.getSession().getServletContext().getRealPath("upload");
- String path = PropertiesUtil.getProperty("ftp.server.upload.dirs");
ServerResponse serverResponse = this.iFileUploadService.uploadFile(file);
if (serverResponse.isSuccess()) {
String targetFileName = serverResponse.getData().toString();
diff --git a/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java b/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java
index c49878a..46ddb71 100644
--- a/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteArticleServiceImpl.java
@@ -91,16 +91,16 @@
public ServerResponse list(String artTitle, String artType, int pageNum, int pageSize, HttpServletRequest request) {
PageHelper.startPage(pageNum, pageSize);
List<SiteArticle> siteArticles = this.siteArticleMapper.list(artTitle, artType);
- for (SiteArticle siteArticle : siteArticles) {
- if (request.getHeader("lang") != null && !request.getHeader("lang").equals("zh-CN") && !request.getHeader("lang").equals("tww") && !request.getHeader("lang").equals("")) {
- GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
- try {
- siteArticle.setArtTitle(googleTranslateUtil.translate(siteArticle.getArtTitle(), request.getHeader("lang")));
- } catch (Exception e) {
- log.error("翻译失败");
- }
- }
- }
+// for (SiteArticle siteArticle : siteArticles) {
+// if (request.getHeader("lang") != null && !request.getHeader("lang").equals("zh-CN") && !request.getHeader("lang").equals("tww") && !request.getHeader("lang").equals("")) {
+// GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
+// try {
+// siteArticle.setArtTitle(googleTranslateUtil.translate(siteArticle.getArtTitle(), request.getHeader("lang")));
+// } catch (Exception e) {
+// log.error("翻译失败");
+// }
+// }
+// }
PageInfo pageInfo = new PageInfo(siteArticles);
return ServerResponse.createBySuccess(pageInfo);
}
diff --git a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
index 65be353..b67784c 100644
--- a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
@@ -76,14 +76,14 @@
List<SiteNews> listData = this.siteNewsMapper.pageList(pageNum, pageSize, type, sort, keyword);
GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
//取出每一条数据的内容，进行翻译
- for (SiteNews siteNews : listData) {
- try {
- siteNews.setTitle(googleTranslateUtil.translate(siteNews.getTitle(), "zh-CN"));
- siteNews.setSourceName(googleTranslateUtil.translate(siteNews.getSourceName(), "zh-CN"));
- } catch (Exception e) {
- log.error("翻译失败");
- }
- }
+// for (SiteNews siteNews : listData) {
+// try {
+// siteNews.setTitle(googleTranslateUtil.translate(siteNews.getTitle(), "zh-CN"));
+// siteNews.setSourceName(googleTranslateUtil.translate(siteNews.getSourceName(), "zh-CN"));
+// } catch (Exception e) {
+// log.error("翻译失败");
+// }
+// }
PageInfo pageInfo = new PageInfo(listData);
diff --git a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
index 500cde5..fc8d838 100644
--- a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
@@ -64,8 +64,8 @@
stockDzVo.setStockSurplus(stockDz.getStockSurplus());
stockDzVo.setIsLock(stockDz.getIsLock());
stockDzVo.setStockNum(stockDz.getStockNum());
- stockDzVo.setStartTime(stockDz.getStartTime());
- stockDzVo.setEndTime(stockDz.getEndTime());
+// stockDzVo.setStartTime(stockDz.getStartTime());
+// stockDzVo.setEndTime(stockDz.getEndTime());
stockDzVos.add(stockDzVo);
}
return ServerResponse.createBySuccess(stockDzVos);
@@ -73,8 +73,7 @@
@Override
public ServerResponse addByAdmin(String stockCode, String stockNum, Integer isShow, String startTime, String endTime, String discount,Integer stockShare) {
- if (stockCode == null || stockCode.equals("")||stockNum == null || stockNum.equals("")|| isShow == null || stockShare == null ||discount == null|| discount.equals("")||
- startTime == null || startTime.equals("")||endTime == null || endTime.equals("")){
+ if (stockCode == null || stockCode.equals("")||stockNum == null || stockNum.equals("")|| isShow == null || stockShare == null ||discount == null|| discount.equals("")){
return ServerResponse.createByErrorMsg("参数不能为空");
}
Stock stock = stockMapper.findStockByCode(stockCode);
@@ -96,8 +95,8 @@
stockDz.setIncreaseRatio(BigDecimal.ZERO);
stockDz.setStockNum(Integer.valueOf(stockNum));
stockDz.setIsShow(isShow);
- stockDz.setStartTime(DateTimeUtil.strToDate(startTime));
- stockDz.setEndTime(DateTimeUtil.strToDate(endTime));
+// stockDz.setStartTime(DateTimeUtil.strToDate(startTime));
+// stockDz.setEndTime(DateTimeUtil.strToDate(endTime));
stockDz.setDiscount(new BigDecimal(discount));
int res = stockDzMapper.insert(stockDz);
if (res > 0) {
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index aec300d..b804fd7 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -2507,11 +2507,11 @@
// .getBuySameNums() + "条");
// }
- Integer transNum = findPositionNumByTimes(siteSetting.getBuyNumTimes().intValue(), user.getId());
- if (transNum.intValue() / 100 >= siteSetting.getBuyNumLots().intValue()) {
- return ServerResponse.createByErrorMsg("频繁交易," + siteSetting
- .getBuyNumTimes() + "分钟内不能超过" + siteSetting.getBuyNumLots() + "手");
- }
+// Integer transNum = findPositionNumByTimes(siteSetting.getBuyNumTimes().intValue(), user.getId());
+// if (transNum.intValue() / 100 >= siteSetting.getBuyNumLots().intValue()) {
+// return ServerResponse.createByErrorMsg("频繁交易," + siteSetting
+// .getBuyNumTimes() + "分钟内不能超过" + siteSetting.getBuyNumLots() + "手");
+// }
if (num < stockDz.getStockNum().intValue()) {
return ServerResponse.createByErrorMsg("下单失败，购买数量最小为" + stockDz.getStockNum() + "股");
@@ -2564,45 +2564,45 @@
log.info("當前漲跌幅 = {} % , 漲停幅度 = {} %", Double.valueOf(stock_crease), ztRate);
- if (stockDz.getStockPlate() == null || StringUtils.isEmpty(stockDz.getStockPlate())) {
-
- int maxcrease = siteSetting.getCreaseMaxPercent().intValue();
- if (stock_crease > 0.0D &&
- stock_crease >= maxcrease) {
- return ServerResponse.createByErrorMsg("下单失败，股票当前涨幅:" + stock_crease + ",大于最大涨幅:" + maxcrease);
- }
-
- if (stock_crease < 0.0D &&
- -stock_crease > maxcrease) {
- return ServerResponse.createByErrorMsg("下单失败，股票当前跌幅:" + stock_crease + ",大于最大跌幅:" + maxcrease);
-
- }
-
- } else if ("创业".equals(stockDz.getStockPlate())) {
-
- int maxcrease = siteSetting.getCyCreaseMaxPercent().intValue();
- if (stock_crease > 0.0D &&
- stock_crease >= maxcrease) {
- return ServerResponse.createByErrorMsg("下单失败，创业股当前涨幅:" + stock_crease + ",大于最大涨幅:" + maxcrease);
- }
-
- if (stock_crease < 0.0D &&
- -stock_crease > maxcrease) {
- return ServerResponse.createByErrorMsg("下单失败，创业股当前跌幅:" + stock_crease + ",大于最大跌幅:" + maxcrease);
- }
- } else {
-
- int maxcrease = siteSetting.getKcCreaseMaxPercent().intValue();
- if (stock_crease > 0.0D &&
- stock_crease >= maxcrease) {
- return ServerResponse.createByErrorMsg("下单失败，科创股当前涨幅:" + stock_crease + ",大于最大涨幅:" + maxcrease);
- }
-
- if (stock_crease < 0.0D &&
- -stock_crease > maxcrease) {
- return ServerResponse.createByErrorMsg("下单失败，科创股当前跌幅:" + stock_crease + ",大于最大跌幅:" + maxcrease);
- }
- }
+// if (stockDz.getStockPlate() == null || StringUtils.isEmpty(stockDz.getStockPlate())) {
+//
+// int maxcrease = siteSetting.getCreaseMaxPercent().intValue();
+// if (stock_crease > 0.0D &&
+// stock_crease >= maxcrease) {
+// return ServerResponse.createByErrorMsg("下单失败，股票当前涨幅:" + stock_crease + ",大于最大涨幅:" + maxcrease);
+// }
+//
+// if (stock_crease < 0.0D &&
+// -stock_crease > maxcrease) {
+// return ServerResponse.createByErrorMsg("下单失败，股票当前跌幅:" + stock_crease + ",大于最大跌幅:" + maxcrease);
+//
+// }
+//
+// } else if ("创业".equals(stockDz.getStockPlate())) {
+//
+// int maxcrease = siteSetting.getCyCreaseMaxPercent().intValue();
+// if (stock_crease > 0.0D &&
+// stock_crease >= maxcrease) {
+// return ServerResponse.createByErrorMsg("下单失败，创业股当前涨幅:" + stock_crease + ",大于最大涨幅:" + maxcrease);
+// }
+//
+// if (stock_crease < 0.0D &&
+// -stock_crease > maxcrease) {
+// return ServerResponse.createByErrorMsg("下单失败，创业股当前跌幅:" + stock_crease + ",大于最大跌幅:" + maxcrease);
+// }
+// } else {
+//
+// int maxcrease = siteSetting.getKcCreaseMaxPercent().intValue();
+// if (stock_crease > 0.0D &&
+// stock_crease >= maxcrease) {
+// return ServerResponse.createByErrorMsg("下单失败，科创股当前涨幅:" + stock_crease + ",大于最大涨幅:" + maxcrease);
+// }
+//
+// if (stock_crease < 0.0D &&
+// -stock_crease > maxcrease) {
+// return ServerResponse.createByErrorMsg("下单失败，科创股当前跌幅:" + stock_crease + ",大于最大跌幅:" + maxcrease);
+// }
+// }
ServerResponse serverResponse = this.iStockService.selectRateByDaysAndStockCode(stockDz.getStockCode(), siteSetting.getStockDays().intValue());
@@ -2613,10 +2613,10 @@
log.info("股票 {} ， {} 天內 漲幅 {} , 設置的漲幅 = {}", new Object[]{stockDz.getStockCode(), siteSetting
.getStockDays(), daysRate, siteSetting.getStockRate()});
- if (daysRate != null && siteSetting.getStockRate().compareTo(daysRate) == -1) {
- return serverResponse.createByErrorMsg(siteSetting.getStockDays() + "天内涨幅超过 " + siteSetting
- .getStockRate() + "不能交易");
- }
+// if (daysRate != null && siteSetting.getStockRate().compareTo(daysRate) == -1) {
+// return serverResponse.createByErrorMsg(siteSetting.getStockDays() + "天内涨幅超过 " + siteSetting
+// .getStockRate() + "不能交易");
+// }
//BigDecimal buy_amt = now_price.multiply(new BigDecimal(buyNum.intValue())).divide(new BigDecimal(lever.intValue())).setScale(2, 4);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2db9183..2bace90 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -10,26 +10,16 @@
ftp.pass=ftp_red
ftp.server.http.prefix=https://ftp.shengliankeji.top/
loca.images.dir=/www/wwwroot/ftp.shengliankeji.top/
-#????????????--??
+
pdf.server.http.prefix=https://stockapdf.shengliankeji.top
-#????????????--??
-#pdf.server.http.prefix=http://localhost:8099/imgs
-#????????--??
loca.pdf.dir=/www/wwwroot/stock.A.PDF
-#????????--??
-#loca.pdf.dir=D:/work/A-stock/agreement_pdf
-#????--??
pdf.template.dir=/www/wwwroot/ftp.shengliankeji.top/templates
-#????--??
-#pdf.template.dir=D:/work/A-stock/src/main/resources/templates
-#ftp.server.ip=47.56.200.145
-#ftp.user=ofsuccess
-#ftp.pass=fdymdM34HHsS8iB6
-#ftp.server.http.prefix=http://www.img.yfkgzq.com/
-#??
sina.single.stock.sort.proxy.url=http://103.30.7.134:7001/crypto/getStockSort.do?
sina.single.stock.proxy.url=http://103.30.7.134:7001/crypto/getSinaStock?stockGid=
-#??
+
+#pdf.server.http.prefix=http://localhost:8099/imgs
+#loca.pdf.dir=D:/work/A-stock/agreement_pdf
+#pdf.template.dir=D:/work/A-stock/src/main/resources/templates
#sina.single.stock.sort.proxy.url=http://localhost:7001/crypto/getStockSort.do?
#sina.single.stock.proxy.url=http://localhost:7001/crypto/getSinaStock?stockGid=
--
Gitblit v1.9.3