From 2a13fc3d05c012766eb677cb0486e6dcf9ed1bf2 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 29 Aug 2024 18:30:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 93 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index a4ab61e..3ea48a3 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -12,6 +12,8 @@
import java.math.BigDecimal;
import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -21,6 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -58,11 +61,17 @@
@Autowired
IUserRechargeService iUserRechargeService;
-
-
@Autowired
IApplyLeverServices iApplyLeverServices;
+ @Autowired
+ private ISiteVipRobService iSiteVipRobService;
+
+ private static final ThreadLocal<Boolean> orderCreated = ThreadLocal.withInitial(() -> false);
+ private final Lock lock = new ReentrantLock();
+
+ private static final ThreadLocal<Boolean> buyOrderCreated = ThreadLocal.withInitial(() -> false);
+ private final Lock buyLock = new ReentrantLock();
//添加到自选股
@RequestMapping({"addOption.do"})
@@ -105,9 +114,32 @@
@RequestParam("buyNum") Integer buyNum,
@RequestParam("buyType") Integer buyType,
@RequestParam("lever") Integer lever,
+ @RequestParam(value = "password",required = false) String password,
@RequestParam(value = "profitTarget",required = false)
- BigDecimal profitTarget,@RequestParam(value = "stopTarget",required = false) BigDecimal stopTarget, HttpServletRequest request) {
- return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
+ BigDecimal profitTarget,@RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss, HttpServletRequest request) {
+ buyLock.lock();
+ try {
+ if (buyOrderCreated.get()) {
+ return ServerResponse.createByErrorMsg("当前下单人数过多,请稍后重试", request);
+ }
+ buyOrderCreated.set(true);
+ return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss, password,request,null);
+ } catch (Exception e) {
+ return ServerResponse.createByErrorMsg("订单异常,请稍后重试", request);
+ } finally{
+ buyLock.unlock();
+ buyOrderCreated.set(false);
+ }
+ }
+ @GetMapping("checkStockVip.do")
+ @ResponseBody
+ public ServerResponse checkStockVip(@RequestParam("stockId") Integer stockId,
+ @RequestParam("buyNum") Integer buyNum,
+ @RequestParam("buyType") Integer buyType,
+ @RequestParam("lever") Integer lever,
+ @RequestParam(value = "profitTarget",required = false) BigDecimal profitTarget,
+ @RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss, HttpServletRequest request){
+ return ServerResponse.createBySuccess(iUserPositionService.checkStockVip(stockId,buyNum,buyType,lever,profitTarget,stopLoss,request));
}
//修改涨跌板
@RequestMapping({"updateProfitTarget.do"})
@@ -125,7 +157,7 @@
@RequestMapping({"sell.do"})
@ResponseBody
public ServerResponse sell(HttpServletRequest request, @RequestParam("positionSn") String positionSn) {
- return this.iUserPositionService.sell(positionSn, 1,request);
+ return this.iUserPositionService.sell(positionSn, 1);
}
@@ -245,21 +277,24 @@
@RequestMapping({"upload.do"})
@ResponseBody
public ServerResponse upload(HttpSession session, @RequestParam(value = "upload_file", required = false) MultipartFile file, HttpServletRequest request) {
- String path = request.getSession().getServletContext().getRealPath("upload");
+ try {
+ String path = request.getSession().getServletContext().getRealPath("upload");
- ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
- if (serverResponse.isSuccess()) {
- String targetFileName = serverResponse.getData().toString();
- String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
+ ServerResponse serverResponse = this.iFileUploadService.upload(file, path);
+ if (serverResponse.isSuccess()) {
+ String targetFileName = serverResponse.getData().toString();
+ String url = PropertiesUtil.getProperty("ftp.server.http.prefix") + targetFileName;
+ Map fileMap = Maps.newHashMap();
+ fileMap.put("uri", targetFileName);
+ fileMap.put("url", url);
-
- Map fileMap = Maps.newHashMap();
- fileMap.put("uri", targetFileName);
- fileMap.put("url", url);
-
- return ServerResponse.createBySuccess(fileMap);
+ return ServerResponse.createBySuccess(fileMap);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("上传失败",e);
}
- return serverResponse;
+ return ServerResponse.createByErrorMsg("上传失败");
}
@@ -274,8 +309,14 @@
*/
@RequestMapping({"list.do"})
@ResponseBody
- public ServerResponse list(@RequestParam(value = "name", required = false) String name,@RequestParam(value = "code", required = false) String code,@RequestParam(value = "zt", required = false) Integer zt,@RequestParam(value = "isLock", required = false) Integer isLock,@RequestParam(value = "type", required = false) Integer type, HttpServletRequest request) {
- return this.iStockSubscribeService.list(name,code,zt,isLock,type,request);
+ public ServerResponse list(@RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "code", required = false) String code,
+ @RequestParam(value = "zt", required = false) Integer zt,
+ @RequestParam(value = "isLock", required = false) Integer isLock,
+ @RequestParam(value = "type", required = false) Integer type,
+ @RequestParam(value = "getType", required = false) Integer getType,
+ HttpServletRequest request) {
+ return this.iStockSubscribeService.list(name,code,zt,getType,isLock,type,request);
}
/**
* 新股申购 添加
@@ -331,7 +372,19 @@
@RequestMapping({"buyStockDz.do"})
@ResponseBody
public ServerResponse buyDz(@RequestParam("stockCode") String stockCode, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
- return this.iUserPositionService.buyDz(stockCode, password, num, request);
+ lock.lock();
+ try {
+ if (orderCreated.get()) {
+ return ServerResponse.createByErrorMsg("当前内幕交易人数过多,请稍后重试", request);
+ }
+ orderCreated.set(true);
+ return this.iUserPositionService.buyDz(stockCode, password, num, request);
+ } catch (Exception e) {
+ return ServerResponse.createByErrorMsg("订单异常,请稍后重试", request);
+ } finally{
+ lock.unlock();
+ orderCreated.set(false);
+ }
}
//大宗下单列表
@RequestMapping({"buyStockDzList.do"})
--
Gitblit v1.9.3