From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/controller/AccountController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/AccountController.java b/src/main/java/com/moral/controller/AccountController.java
index 1291871..5d6424e 100644
--- a/src/main/java/com/moral/controller/AccountController.java
+++ b/src/main/java/com/moral/controller/AccountController.java
@@ -2,12 +2,15 @@
import static com.moral.common.util.WebUtils.getParametersStartingWith;
+import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -31,9 +34,22 @@
return new ResultBean<PageBean<Account>>(accounts);
}
- @GetMapping("account")
+ @PostMapping("account")
public ResultBean<Integer> saveOrUpdateAccount(@RequestBody Account account) {
Integer result = accountService.saveOrUpdateAccount(account);
return new ResultBean<Integer>(result);
}
+
+ @PostMapping("ids")
+ public ResultBean<Integer> deleteAccountsByLogic(@RequestBody List<Integer> ids) {
+ Integer result = accountService.deleteAccountsByLogic(ids);
+ return new ResultBean<Integer>(result);
+ }
+
+ @GetMapping("{accountName}")
+ public ResultBean<Integer> getAccountCountByAccountName(@PathVariable("accountName") String accountName) {
+ Integer result = accountService.getAccountCountByAccountName(accountName);
+ return new ResultBean<Integer>(result);
+ }
+
}
--
Gitblit v1.8.0