From 7a2f69e4cf9771c9450b009ea5deaaa07e279f11 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 28 Jul 2022 22:44:42 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
index 2e8600d..008b830 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/DappUserController.java
@@ -1,20 +1,24 @@
package cc.mrbird.febs.dapp.controller;
import cc.mrbird.febs.common.annotation.ControllerEndpoint;
+import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.dapp.dto.SimulateDataDto;
+import cc.mrbird.febs.dapp.service.DappSimulateDataService;
import cc.mrbird.febs.dapp.service.DappUserService;
import cc.mrbird.febs.system.entity.User;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
/**
- * @author wzy
+ * @author
* @date 2022-03-24
**/
@Slf4j
@@ -22,9 +26,20 @@
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "dappUser")
-public class DappUserController {
+public class DappUserController extends BaseController {
private final DappUserService dappUserService;
+ private final DappSimulateDataService dappSimulateDataService;
+
+ @RequiresPermissions("admin:view")
+ @GetMapping(value = "/list")
+ public FebsResponse list(User user, QueryRequest request) {
+ User currentUser = FebsUtil.getCurrentUser();
+ if (currentUser.getDeptId() == null) {
+ user.setCreateBy(currentUser.getUserId());
+ }
+ return new FebsResponse().success().data(getDataTable(dappUserService.findInPage(user, request)));
+ }
@RequiresPermissions("admin:add")
@PostMapping(value = "/add")
@@ -42,15 +57,18 @@
}
@RequiresPermissions("admin:delete")
- @PostMapping(value = "/delete")
+ @PostMapping(value = "/delete/{ids}")
@ControllerEndpoint(operation = "删除用户", exceptionMessage = "删除用户失败")
- public FebsResponse delete(User user) {
- return null;
+ public FebsResponse delete(@PathVariable("ids") String ids) {
+ dappUserService.delete(ids);
+ return new FebsResponse().success();
}
- @PostMapping(value = "/resetPwd/{id}")
- @ControllerEndpoint(operation = "重置密码", exceptionMessage = "重置密码失败")
- public FebsResponse resetPwd(@PathVariable("id") Long id) {
- return null;
+ @RequiresPermissions("admin:simulate")
+ @PostMapping(value = "/simulateData")
+ @ControllerEndpoint(operation = "生成虚拟收益", exceptionMessage = "生成虚拟收益失败")
+ public FebsResponse simulateData(@Valid SimulateDataDto simulateDataDto) {
+ String batchNo = dappSimulateDataService.generateSimulateData(simulateDataDto);
+ return new FebsResponse().success().data(batchNo);
}
}
--
Gitblit v1.9.1