From 9beb428f807920b0dd646edbed822313c47961c6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Apr 2021 14:45:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/agent
---
src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java
index 57a68ed..12b7ea0 100644
--- a/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/agent/controller/ViewController.java
@@ -2,9 +2,14 @@
import com.xcong.excoin.common.entity.FebsConstant;
import com.xcong.excoin.common.utils.FebsUtil;
+import com.xcong.excoin.system.entity.User;
+import com.xcong.excoin.system.service.IUserService;
+import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
/**
@@ -13,14 +18,26 @@
**/
@Controller("memberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "/agent")
+@RequiredArgsConstructor
public class ViewController {
+
+ private final IUserService userService;
+
+ /**
+ * 数据总览
+ * @return
+ */
+ @GetMapping("allMemberData")
+ @RequiresPermissions("allMemberData:view")
+ public String allMemberData() {
+ return FebsUtil.view("modules/contract/total-data");
+ }
@GetMapping("member")
@RequiresPermissions("amember:view")
public String member() {
return FebsUtil.view("modules/agent/member");
}
-
@GetMapping("agent")
@RequiresPermissions("agent:view")
@@ -33,4 +50,12 @@
public String agentAdd() {
return FebsUtil.view("modules/agent/agentAdd");
}
+
+ @GetMapping("agentEdit/{id}")
+ @RequiresPermissions("agent:edit")
+ public String agentEdit(@PathVariable Long id, Model model) {
+ User user = userService.findUserInfoById(id);
+ model.addAttribute("user", user);
+ return FebsUtil.view("modules/agent/agentEdit");
+ }
}
--
Gitblit v1.9.1