From d275747a472b31e15f8f5de8916d583b836c1dce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 23 Jul 2020 11:09:39 +0800
Subject: [PATCH] 20200723 代码提交
---
src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java | 210 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 143 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
index 8a1bf15..ef2ef78 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/ViewController.java
@@ -1,67 +1,143 @@
-package com.xcong.excoin.modules.trademanage.controller;
-
-import com.xcong.excoin.common.entity.FebsConstant;
-import com.xcong.excoin.common.utils.FebsUtil;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author wzy
- * @date 2020-06-10
- **/
-@Controller("tradeManageView")
-@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/trademanage")
-public class ViewController {
-
- /**
- * 当前持仓
- */
- @GetMapping("contractHoldOrder")
- @RequiresPermissions("contractHoldOrder:view")
- public String contractHoldOrder() {
- return FebsUtil.view("modules/trademanage/contractHoldOrder");
- }
-
- /**
- * 账户信息
- * @return
- */
- @GetMapping("accountInfo")
- @RequiresPermissions("accountInfo:view")
- public String accountInfo() {
- return FebsUtil.view("modules/trademanage/accountInfo");
- }
-
- /**
- * 返佣明细
- * @return
- */
- @GetMapping("agentReturnInfo")
- @RequiresPermissions("agentReturnInfo:view")
- public String agentReturnInfo() {
- return FebsUtil.view("modules/trademanage/agentReturnInfo");
- }
-
- /**
- * 返佣总明细
- * @return
- */
- @GetMapping("agentReturnInfos")
- @RequiresPermissions("agentReturnInfos:view")
- public String agentReturnInfos() {
- return FebsUtil.view("modules/trademanage/agentReturnInfos");
- }
-
- /**
- * 历史委托明细
- * @return
- */
- @GetMapping("historyOrder")
- @RequiresPermissions("historyOrder:view")
- public String historyOrder() {
- return FebsUtil.view("modules/trademanage/historyOrder");
- }
-
-}
+package com.xcong.excoin.modules.trademanage.controller;
+
+import com.xcong.excoin.common.entity.FebsConstant;
+import com.xcong.excoin.common.utils.FebsUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+@Controller("tradeManageView")
+@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/trademanage")
+public class ViewController {
+
+ /**
+ * 当前持仓
+ */
+ @GetMapping("contractHoldOrder")
+ @RequiresPermissions("contractHoldOrder:view")
+ public String contractHoldOrder() {
+ return FebsUtil.view("modules/trademanage/contractHoldOrder");
+ }
+
+ /**
+ * 当前持仓---alone
+ */
+ @GetMapping("contractHoldOrderAlone")
+ @RequiresPermissions("contractHoldOrderAlone:view")
+ public String contractHoldOrderAlone() {
+ return FebsUtil.view("modules/trademanage/contractHoldOrderAlone");
+ }
+
+ /**
+ * 当前持仓---Test
+ */
+ @GetMapping("contractHoldOrderAloneTest")
+ @RequiresPermissions("contractHoldOrderAloneTest:view")
+ public String contractHoldOrderAloneTest() {
+ return FebsUtil.view("modules/trademanage/contractHoldOrderAloneTest");
+ }
+
+ /**
+ * 账户信息
+ * @return
+ */
+ @GetMapping("accountInfo")
+ @RequiresPermissions("accountInfo:view")
+ public String accountInfo() {
+ return FebsUtil.view("modules/trademanage/accountInfo");
+ }
+ /**
+ * 账户信息---alone
+ * @return
+ */
+ @GetMapping("accountInfoAlone")
+ @RequiresPermissions("accountInfoAlone:view")
+ public String accountInfoAlone() {
+ return FebsUtil.view("modules/trademanage/accountInfoAlone");
+ }
+
+ /**
+ * 返佣明细
+ * @return
+ */
+ @GetMapping("agentReturnInfo")
+ @RequiresPermissions("agentReturnInfo:view")
+ public String agentReturnInfo() {
+ return FebsUtil.view("modules/trademanage/agentReturnInfo");
+ }
+
+ /**
+ * 返佣总明细
+ * @return
+ */
+ @GetMapping("agentReturnInfos")
+ @RequiresPermissions("agentReturnInfos:view")
+ public String agentReturnInfos() {
+ return FebsUtil.view("modules/trademanage/agentReturnInfos");
+ }
+
+ /**
+ * 历史委托明细
+ * @return
+ */
+ @GetMapping("historyOrder")
+ @RequiresPermissions("historyOrder:view")
+ public String historyOrder() {
+ return FebsUtil.view("modules/trademanage/historyOrder");
+ }
+
+ /**
+ * 历史委托明细---alone
+ * @return
+ */
+ @GetMapping("historyOrderAlone")
+ @RequiresPermissions("historyOrderAlone:view")
+ public String historyOrderAlone() {
+ return FebsUtil.view("modules/trademanage/historyOrderAlone");
+ }
+
+ /**
+ * 历史委托明细---Test
+ * @return
+ */
+ @GetMapping("historyOrderAloneTest")
+ @RequiresPermissions("historyOrderAloneTest:view")
+ public String historyOrderAloneTest() {
+ return FebsUtil.view("modules/trademanage/historyOrderAloneTest");
+ }
+
+ /**
+ * 全部历史委托明细
+ * @return
+ */
+ @GetMapping("historyOrderAll")
+ @RequiresPermissions("historyOrderAll:view")
+ public String historyOrderAll() {
+ return FebsUtil.view("modules/trademanage/historyOrderAll");
+ }
+
+ /**
+ * 返佣总明细
+ * @return
+ */
+ @GetMapping("agentReturnInfosAlone")
+ @RequiresPermissions("agentReturnInfosAlone:view")
+ public String agentReturnInfosAlone() {
+ return FebsUtil.view("modules/trademanage/agentReturnInfosAlone");
+ }
+ /**
+ * 返佣总明细--Test
+ * @return
+ */
+ @GetMapping("agentReturnInfosAloneTest")
+ @RequiresPermissions("agentReturnInfosAloneTest:view")
+ public String agentReturnInfosAloneTest() {
+ return FebsUtil.view("modules/trademanage/agentReturnInfosAloneTest");
+ }
+
+}
--
Gitblit v1.9.1