@@ -60,6 +63,7 @@ import {onMounted, reactive, ref} from "vue";
import http, {DataListModel} from "../../util/http";
import message from "../../components/message";
import Modal from "../../components/modal/modal.vue";
+import Pager from "../../components/pager/Pager.vue";
//
const GenderEnum = {
1: '男', 2: '女'
@@ -88,6 +92,11 @@ const editUserData = reactive({
});
const userTotalCount = ref(0)
+function onPageChange(currentPage: number) {
+ param.page = currentPage;
+ loadUserList();
+}
+
function loadUserList() {
http.post>('/admin/user/list', param).then(res => {
userList.value = res.items
diff --git a/api/src/main/java/me/xiaoyan/point/api/controller/admin/UserAdminController.java b/api/src/main/java/me/xiaoyan/point/api/controller/admin/UserAdminController.java
index 29c2f33..e2334a6 100644
--- a/api/src/main/java/me/xiaoyan/point/api/controller/admin/UserAdminController.java
+++ b/api/src/main/java/me/xiaoyan/point/api/controller/admin/UserAdminController.java
@@ -34,6 +34,12 @@ public class UserAdminController {
userStoreMap.put("test", UserAdminInfo.create(2, "test", "123123"));
}
+ @PostMapping
+ public UserInfo update(@RequestBody UserInfo userInfo) {
+ if (!userInfoService.updateById(userInfo)) throw BizException.saveFail();
+ return userInfo;
+ }
+
@SneakyThrows
@PostMapping("login")
public UserAdminInfo login(@Validated @RequestBody UserAdminInfo user) {
diff --git a/api/src/main/java/me/xiaoyan/point/api/error/BizException.java b/api/src/main/java/me/xiaoyan/point/api/error/BizException.java
index dc70520..4dea2a5 100644
--- a/api/src/main/java/me/xiaoyan/point/api/error/BizException.java
+++ b/api/src/main/java/me/xiaoyan/point/api/error/BizException.java
@@ -20,4 +20,8 @@ public class BizException extends RuntimeException {
public static BizException create(int code,String message) {
return new BizException(code, message);
}
+
+ public static BizException saveFail() {
+ return create(1022,"保存失败");
+ }
}
\ No newline at end of file
diff --git a/api/src/main/java/me/xiaoyan/point/api/pojo/UserInfo.java b/api/src/main/java/me/xiaoyan/point/api/pojo/UserInfo.java
index 28e3239..c6a3c77 100644
--- a/api/src/main/java/me/xiaoyan/point/api/pojo/UserInfo.java
+++ b/api/src/main/java/me/xiaoyan/point/api/pojo/UserInfo.java
@@ -10,6 +10,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
@@ -24,6 +25,7 @@ public class UserInfo implements Serializable {
* 用户id
*/
@TableId(type = IdType.AUTO)
+ @NotNull
private Integer id;
/**
* 微信openid