From ea772fcdef390ca8bdb6746a1504e5ca88037d00 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 27 Jun 2025 16:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/controller/agent/AgentStockDz.java | 63 ++++++++++
.idea/jarRepositories.xml | 5
src/main/java/com/nq/controller/agent/AgentStockSettingController.java | 47 +++++++
src/main/java/com/nq/controller/agent/AgentStockSubscribeController.java | 130 +++++++++++++++++++++
src/main/java/com/nq/controller/agent/AgentStockController.java | 85 ++++++++++++++
5 files changed, 330 insertions(+), 0 deletions(-)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 694ac9e..87343f1 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -8,6 +8,11 @@
</remote-repository>
<remote-repository>
<option name="id" value="central" />
+ <option name="name" value="Central Repository" />
+ <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
diff --git a/src/main/java/com/nq/controller/agent/AgentStockController.java b/src/main/java/com/nq/controller/agent/AgentStockController.java
new file mode 100644
index 0000000..344742e
--- /dev/null
+++ b/src/main/java/com/nq/controller/agent/AgentStockController.java
@@ -0,0 +1,85 @@
+package com.nq.controller.agent;
+
+import com.nq.common.ServerResponse;
+
+import com.nq.pojo.Stock;
+import com.nq.service.IStockService;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+
+import org.springframework.web.bind.annotation.ResponseBody;
+
+
+@Controller
+@RequestMapping({"/agent/stock/"})
+public class AgentStockController {
+ private static final Logger log = LoggerFactory.getLogger(AgentStockController.class);
+
+ @Autowired
+ IStockService iStockService;
+
+ //查询产品管理 所以股票信息及模糊查询
+ @RequestMapping({"list.do"})
+ @ResponseBody
+ public ServerResponse list(@RequestParam(value = "stockGid", required = false) String stockGid,
+ @RequestParam(value = "showState", required = false) Integer showState,
+ @RequestParam(value = "lockState", required = false) Integer lockState,
+ @RequestParam(value = "code", required = false) String code,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "stockPlate", required = false) String stockPlate,
+ @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+ HttpServletRequest request) {
+ return this.iStockService.listByAdmin(stockGid,showState, lockState, code, name, stockPlate, null, pageNum, pageSize, request);
+ }
+
+ //修改产品管理 股票是否锁定
+ @RequestMapping({"updateLock.do"})
+ @ResponseBody
+ public ServerResponse updateLock(Integer stockId) {
+ return this.iStockService.updateLock(stockId);
+ }
+
+ //修改产品管理 股票状态
+ @RequestMapping({"updateShow.do"})
+ @ResponseBody
+ public ServerResponse updateShow(Integer stockId) {
+ return this.iStockService.updateShow(stockId);
+ }
+
+ //添加产品管理 股票信息
+ @RequestMapping({"add.do"})
+ @ResponseBody
+ public ServerResponse add(@RequestParam(value = "stockName", required = false) String stockName, @RequestParam(value = "stockCode", required = false) String stockCode, @RequestParam(value = "stockType", required = false) String stockType, @RequestParam(value = "stockPlate", required = false) String stockPlate, @RequestParam(value = "isLock", required = false) Integer isLock, @RequestParam(value = "isShow", required = false) Integer isShow) {
+ return this.iStockService.addStock(stockName, stockCode, stockType, stockPlate, isLock, isShow);
+ }
+
+ //修改票信息
+ @RequestMapping({"updateStock.do"})
+ @ResponseBody
+ public ServerResponse updateStock(Stock model) {
+ return this.iStockService.updateStock(model);
+ }
+
+ //删除股票
+ @RequestMapping({"delStock.do"})
+ @ResponseBody
+ public ServerResponse deleteByPrimaryKey(Integer id) {
+ return this.iStockService.deleteByPrimaryKey(id);
+ }
+
+
+
+}
diff --git a/src/main/java/com/nq/controller/agent/AgentStockDz.java b/src/main/java/com/nq/controller/agent/AgentStockDz.java
new file mode 100644
index 0000000..57714e8
--- /dev/null
+++ b/src/main/java/com/nq/controller/agent/AgentStockDz.java
@@ -0,0 +1,63 @@
+package com.nq.controller.agent;
+
+
+import com.nq.common.ServerResponse;
+import com.nq.pojo.StockDz;
+import com.nq.service.StockDzService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping({"/agent/stockDz/"})
+public class AgentStockDz {
+ @Autowired
+ StockDzService stockDzService;
+
+ /**
+ * @Description: 获取大宗列表
+ * @Param:
+ * @return:
+ */
+ @RequestMapping({"getDzListByAdmin.do"})
+ public ServerResponse getDzListByAdmin(String keywords) {
+ return stockDzService.getDzListByAdmin(keywords);
+ }
+
+ /**
+ * @Description: 新增大宗
+ * @Param:
+ * @return:
+ */
+ @RequestMapping({"addByAdmin.do"})
+ public ServerResponse addByAdmin(@RequestParam(value = "stockCode") String stockCode,
+ @RequestParam(value = "stockNum") String stockNum,
+ @RequestParam(value = "password", required = false) String password,
+ @RequestParam(value = "startTime") String startTime,
+ @RequestParam(value = "endTime") String endTime,
+ @RequestParam(value = "discount", required = false) String discount,
+ @RequestParam(value = "period") Integer period,
+ @RequestParam(value = "nowPrice") String nowPrice,
+ @RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
+ return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType);
+ }
+
+ /**
+ * 删除大宗
+ */
+ @RequestMapping({"deleteByAdmin.do"})
+ public ServerResponse deleteByAdmin(@RequestParam(value = "id") String id) {
+ return stockDzService.deleteByAdmin(id);
+ }
+
+ /**
+ * 修改大宗
+ */
+ @RequestMapping({"updateByAdmin.do"})
+ public ServerResponse updateByAdmin(StockDz model) {
+ return stockDzService.updByAdmin(model);
+ }
+
+}
diff --git a/src/main/java/com/nq/controller/agent/AgentStockSettingController.java b/src/main/java/com/nq/controller/agent/AgentStockSettingController.java
new file mode 100644
index 0000000..7c73bfe
--- /dev/null
+++ b/src/main/java/com/nq/controller/agent/AgentStockSettingController.java
@@ -0,0 +1,47 @@
+package com.nq.controller.agent;
+
+import com.nq.common.ServerResponse;
+import com.nq.pojo.StockSetting;
+import com.nq.service.IStockSettingServices;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping({"/agent/stockSetting/"})
+public class AgentStockSettingController {
+
+
+ @Autowired
+ IStockSettingServices stockSettingServices;
+
+
+ @RequestMapping({"add.do"})
+ @ResponseBody
+ public ServerResponse list(HttpServletRequest request, StockSetting stockSetting) {
+ return stockSettingServices.saveStockSetting(stockSetting);
+ }
+
+ @RequestMapping({"update.do"})
+ @ResponseBody
+ public ServerResponse update(HttpServletRequest request, StockSetting stockSetting) {
+ return stockSettingServices.updateStockSetting(stockSetting);
+ }
+
+ @RequestMapping({"delete.do"})
+ @ResponseBody
+ public ServerResponse delete(HttpServletRequest request,@RequestParam(value = "id") Integer id) {
+ return stockSettingServices.deleteStockSetting(id);
+ }
+
+ @RequestMapping({"queryAll.do"})
+ @ResponseBody
+ public ServerResponse queryAll(HttpServletRequest request,@RequestParam(value = "stockCode", required = false)String stockCode) {
+ return stockSettingServices.queryAll(stockCode);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/nq/controller/agent/AgentStockSubscribeController.java b/src/main/java/com/nq/controller/agent/AgentStockSubscribeController.java
new file mode 100644
index 0000000..24ee63e
--- /dev/null
+++ b/src/main/java/com/nq/controller/agent/AgentStockSubscribeController.java
@@ -0,0 +1,130 @@
+package com.nq.controller.agent;
+
+
+import com.nq.common.ServerResponse;
+import com.nq.pojo.StockSubscribe;
+import com.nq.pojo.UserStockSubscribe;
+import com.nq.service.IStockSubscribeService;
+import com.nq.service.IUserStockSubscribeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping({"/agent/subscribe/"})
+public class AgentStockSubscribeController {
+ private static final Logger log = LoggerFactory.getLogger(AgentStockSubscribeController.class);
+ @Autowired
+ IUserStockSubscribeService iUserStockSubscribeService;
+ @Autowired
+ IStockSubscribeService iStockSubscribeService;
+
+ /**
+ *
+ * @param pageNum
+ * @param pageSize
+ * @param request
+ * @return
+ */
+ @RequestMapping({"list.do"})
+ @ResponseBody
+ public ServerResponse list(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
+ @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 = "stockType", required = false) Integer stockType,
+ HttpServletRequest request) {
+ return this.iStockSubscribeService.list(name,code,zt,0,isLock,type,stockType,1,request);
+ }
+ /**
+ * @Description: 新增新股
+ * @Param:
+ * @return:
+ * @Author: tf
+ * @Date: 2022/10/25
+ */
+ @RequestMapping({"add.do"})
+ @ResponseBody
+ public ServerResponse add(StockSubscribe model, HttpServletRequest request) {
+ return this.iStockSubscribeService.add(model, request);
+
+ }
+ /**
+ * @Description: 修改新股
+ * @Param:
+ * @return:
+ * @Author: tf
+ * @Date: 2022/10/25
+ */
+ @RequestMapping({"update.do"})
+ @ResponseBody
+ public ServerResponse update(StockSubscribe model, HttpServletRequest request) {
+ return this.iStockSubscribeService.update(model, request);
+
+ }
+ /**
+ * @Description: 删除新股
+ * @Param:
+ * @return:
+ * @Author: tf
+ * @Date: 2022/10/25
+ */
+ @RequestMapping({"del.do"})
+ @ResponseBody
+ public ServerResponse del(@RequestParam("id") Integer id, HttpServletRequest request) {
+ return this.iStockSubscribeService.del(id, request);
+
+ }
+
+ //申购信息列表查询
+ @RequestMapping({"getStockSubscribeList.do"})
+ @ResponseBody
+ public ServerResponse getStockSubscribeList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "12") int pageSize,
+ @RequestParam(value = "keyword", defaultValue = "") String keyword,
+ @RequestParam(value = "agentId", required = false) String agentId,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "status", required = false) Integer status,
+ HttpServletRequest request) {
+ return this.iUserStockSubscribeService.getList(pageNum, pageSize, keyword,agentId,name,status, request);
+ }
+
+
+ //申购信息-添加 修改
+ @RequestMapping({"saveStockSubscribe.do"})
+ @ResponseBody
+ public ServerResponse saveStockSubscribe(UserStockSubscribe model, HttpServletRequest request) throws Exception {
+ return this.iUserStockSubscribeService.save(model, request);
+ }
+
+// //添加产品管理 股票信息
+// @RequestMapping({"add.do"})
+// @ResponseBody
+// public ServerResponse add(@RequestParam(value = "stockName", required = false) String stockName, @RequestParam(value = "stockCode", required = false) String stockCode, @RequestParam(value = "stockType", required = false) String stockType, @RequestParam(value = "stockPlate", required = false) String stockPlate, @RequestParam(value = "isLock", required = false) Integer isLock, @RequestParam(value = "isShow", required = false) Integer isShow) {
+// return this.iStockService.addStock(stockName, stockCode, stockType, stockPlate, isLock, isShow);
+// }
+
+
+ //发送站内信
+ @RequestMapping({"sendMsg.do"})
+ @ResponseBody
+ public ServerResponse sendMsg(UserStockSubscribe model, HttpServletRequest request) {
+ return this.iUserStockSubscribeService.sendMsg(model, request);
+ }
+ //新股申购-删除
+ @RequestMapping({"delStockSubscribe.do"})
+ @ResponseBody
+ public ServerResponse delStockSubscribe(@RequestParam("id") int id, HttpServletRequest request) {
+ return this.iUserStockSubscribeService.del(id, request);
+ }
+
+}
--
Gitblit v1.9.3