Commit 04aa420a authored by trumansdo's avatar trumansdo
Browse files

利用完成的自动渲染数据表格的页面,完成用户管理。

todo : 待补充自动渲染数据页面的文档说明。
parent a48eb8ce
...@@ -4,9 +4,9 @@ import com.ibeetl.admin.console.util.VOUtil; ...@@ -4,9 +4,9 @@ import com.ibeetl.admin.console.util.VOUtil;
import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.admin.core.service.CoreUserService;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import java.util.List;
import java.util.Map; import java.util.Map;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -24,8 +24,8 @@ public class UserElController { ...@@ -24,8 +24,8 @@ public class UserElController {
} }
@GetMapping("/users") @GetMapping("/users")
public JsonResult<List<CoreUser>> users(@NotNull Integer page, @NotNull Integer limit) { public JsonResult<PageQuery<CoreUser>> users(@NotNull Integer page, @NotNull Integer limit) {
List<CoreUser> allUsers = coreUserService.getAllUsers(page, limit); PageQuery<CoreUser> allUsers = coreUserService.getAllUsers(page, limit);
return JsonResult.success(allUsers); return JsonResult.success(allUsers);
} }
} }
...@@ -112,7 +112,7 @@ class CustomJsonResultSerializer extends JsonSerializer<JsonResult> { ...@@ -112,7 +112,7 @@ class CustomJsonResultSerializer extends JsonSerializer<JsonResult> {
Object data = value.getData(); Object data = value.getData();
if (data instanceof PageQuery) { if (data instanceof PageQuery) {
PageQuery query = (PageQuery) (data); PageQuery query = (PageQuery) (data);
/*可能叫法不一样,所以返回两种命名*/ /*不同js前端插件会有不一样数据格式,所以返回两种命名*/
gen.writeNumberField("count", query.getTotalRow()); gen.writeNumberField("count", query.getTotalRow());
gen.writeNumberField("total", query.getTotalRow()); gen.writeNumberField("total", query.getTotalRow());
gen.writeObjectField("data", query.getList()); gen.writeObjectField("data", query.getList());
......
...@@ -3,14 +3,12 @@ package com.ibeetl.admin.core.service; ...@@ -3,14 +3,12 @@ package com.ibeetl.admin.core.service;
import com.ibeetl.admin.core.dao.SQLManagerBaseDao; import com.ibeetl.admin.core.dao.SQLManagerBaseDao;
import java.util.List; import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.beetl.sql.core.SQLManager; import org.beetl.sql.core.engine.PageQuery;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.ibeetl.admin.core.conf.PasswordConfig;
import com.ibeetl.admin.core.conf.PasswordConfig.PasswordEncryptService; import com.ibeetl.admin.core.conf.PasswordConfig.PasswordEncryptService;
import com.ibeetl.admin.core.dao.CoreOrgDao; import com.ibeetl.admin.core.dao.CoreOrgDao;
import com.ibeetl.admin.core.dao.CoreUserDao; import com.ibeetl.admin.core.dao.CoreUserDao;
...@@ -75,9 +73,11 @@ public class CoreUserService { ...@@ -75,9 +73,11 @@ public class CoreUserService {
return userDao.getUserByRole(role); return userDao.getUserByRole(role);
} }
@Valid public PageQuery<CoreUser> getAllUsers(@NotNull Integer page, @NotNull Integer limit) {
public List<CoreUser> getAllUsers(@NotNull Integer page, @NotNull Integer limit) { return sqlManagerBaseDao
return sqlManagerBaseDao.getSQLManager().lambdaQuery(CoreUser.class).page(page, limit).getList(); .getSQLManager()
.lambdaQuery(CoreUser.class)
.page(page, limit);
} }
public CoreUser getUserByCode(String userName) { public CoreUser getUserByCode(String userName) {
......
<!-- <!--
* @Author: 一日看尽长安花 * @Author: 一日看尽长安花
* @since: 2019-10-12 16:14:37 * @since: 2019-10-12 16:14:37
* @LastEditTime: 2019-11-04 21:06:33 * @LastEditTime: 2019-11-24 10:52:05
* @LastEditors: 一日看尽长安花 * @LastEditors: 一日看尽长安花
* @Description: * @Description:
--> -->
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column :key="Math.random()" align="right"> <el-table-column :key="Math.random()" width="170" align="right">
<template #header="slot"> <template #header="slot">
<el-input <el-input
v-model="search" v-model="search"
......
<!-- <!--
* @Author: 一日看尽长安花 * @Author: 一日看尽长安花
* @since: 2019-10-12 15:43:18 * @since: 2019-10-12 15:43:18
* @LastEditTime: 2019-11-04 21:00:21 * @LastEditTime: 2019-11-24 21:24:42
* @LastEditors: 一日看尽长安花 * @LastEditors: 一日看尽长安花
* @Description: * @Description: 后台管理页面的自动生成,
* 主要暴露了分页方法、过滤表格(单纯前端过滤)、条件查询、增删改方法
--> -->
<template> <template>
<div> <div>
......
<!-- <!--
* @Author: 一日看尽长安花 * @Author: 一日看尽长安花
* @since: 2019-10-12 15:43:18 * @since: 2019-10-12 15:43:18
* @LastEditTime: 2019-11-04 23:25:52 * @LastEditTime: 2019-11-24 10:50:41
* @LastEditors: 一日看尽长安花 * @LastEditors: 一日看尽长安花
* @Description: * @Description:
--> -->
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
users(queryParams) users(queryParams)
.then(result => { .then(result => {
const { code, data } = { ...result }; const { code, data } = { ...result };
this.tabledata = Object.assign({}, data); this.tabledata = Object.assign({}, result);
}) })
.catch(err => {}) .catch(err => {})
.finally(() => { .finally(() => {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment