From 17c6e3b8266bddf81bac658c83fb0f476c3b0679 Mon Sep 17 00:00:00 2001 From: shuzheng <469741414@qq.com> Date: Tue, 14 Feb 2017 21:32:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E7=BF=BB?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/UpmsOrganizationController.java | 18 ++++++++++++------ .../manage/UpmsPermissionController.java | 10 ++++++++-- .../controller/manage/UpmsRoleController.java | 10 ++++++++-- .../manage/UpmsSystemController.java | 14 +++++++++++--- .../controller/manage/UpmsUserController.java | 10 ++++++++-- .../WEB-INF/jsp/manage/organization/index.jsp | 10 +++++++++- .../WEB-INF/jsp/manage/permission/button.jsp | 10 +++++++++- .../WEB-INF/jsp/manage/permission/index.jsp | 10 +++++++++- .../WEB-INF/jsp/manage/permission/menu.jsp | 10 +++++++++- .../webapp/WEB-INF/jsp/manage/role/index.jsp | 10 +++++++++- .../webapp/WEB-INF/jsp/manage/system/index.jsp | 4 ++-- .../webapp/WEB-INF/jsp/manage/user/index.jsp | 10 +++++++++- 12 files changed, 103 insertions(+), 23 deletions(-) diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsOrganizationController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsOrganizationController.java index 51c1f0c2..99626cac 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsOrganizationController.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsOrganizationController.java @@ -16,7 +16,9 @@ import org.springframework.ui.ModelMap; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 组织controller @@ -49,14 +51,18 @@ public class UpmsOrganizationController extends BaseController { @RequestParam(required = false, value = "sort") String sort, @RequestParam(required = false, value = "order") String order) { // 数据列表 - UpmsOrganizationExample upmsupmsOrganizationExample = new UpmsOrganizationExample(); - upmsupmsOrganizationExample.setOffset(offset); - upmsupmsOrganizationExample.setLimit(limit); + UpmsOrganizationExample upmsOrganizationExample = new UpmsOrganizationExample(); + upmsOrganizationExample.setOffset(offset); + upmsOrganizationExample.setLimit(limit); if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) { - upmsupmsOrganizationExample.setOrderByClause(sort + " " + order); + upmsOrganizationExample.setOrderByClause(sort + " " + order); } - List organizations = upmsOrganizationService.selectByExample(upmsupmsOrganizationExample); - return organizations; + List rows = upmsOrganizationService.selectByExample(upmsOrganizationExample); + long total = upmsOrganizationService.countByExample(upmsOrganizationExample); + Map result = new HashMap<>(); + result.put("rows", rows); + result.put("total", total); + return result; } @ApiOperation(value = "新增组织") diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java index cd2547dd..ef7e5ffb 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java @@ -15,7 +15,9 @@ import org.springframework.ui.ModelMap; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 权限controller @@ -73,8 +75,12 @@ public class UpmsPermissionController extends BaseController { if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) { upmsPermissionExample.setOrderByClause(sort + " " + order); } - List permissions = upmsPermissionService.selectByExample(upmsPermissionExample); - return permissions; + List rows = upmsPermissionService.selectByExample(upmsPermissionExample); + long total = upmsPermissionService.countByExample(upmsPermissionExample); + Map result = new HashMap<>(); + result.put("rows", rows); + result.put("total", total); + return result; } @ApiOperation(value = "新增权限") diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java index 376d1f69..ad7c1977 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java @@ -15,7 +15,9 @@ import org.springframework.ui.ModelMap; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 角色controller @@ -54,8 +56,12 @@ public class UpmsRoleController extends BaseController { if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) { upmsRoleExample.setOrderByClause(sort + " " + order); } - List roles = upmsRoleService.selectByExample(upmsRoleExample); - return roles; + List rows = upmsRoleService.selectByExample(upmsRoleExample); + long total = upmsRoleService.countByExample(upmsRoleExample); + Map result = new HashMap<>(); + result.put("rows", rows); + result.put("total", total); + return result; } @ApiOperation(value = "新增角色") diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsSystemController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsSystemController.java index 5456a026..21e3907e 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsSystemController.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsSystemController.java @@ -15,7 +15,9 @@ import org.springframework.ui.ModelMap; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 系统controller @@ -51,9 +53,15 @@ public class UpmsSystemController extends BaseController { UpmsSystemExample upmsSystemExample = new UpmsSystemExample(); upmsSystemExample.setOffset(offset); upmsSystemExample.setLimit(limit); - List systems = upmsSystemService.selectByExample(upmsSystemExample); -// long total = upmsSystemService.countByExample(upmsSystemExample); - return systems; + if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) { + upmsSystemExample.setOrderByClause(sort + " " + order); + } + List rows = upmsSystemService.selectByExample(upmsSystemExample); + long total = upmsSystemService.countByExample(upmsSystemExample); + Map result = new HashMap<>(); + result.put("rows", rows); + result.put("total", total); + return result; } @ApiOperation(value = "新增系统") diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java index 70a403dd..9e78b31a 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java @@ -15,7 +15,9 @@ import org.springframework.ui.ModelMap; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 用户controller @@ -54,8 +56,12 @@ public class UpmsUserController extends BaseController { if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) { upmsUserExample.setOrderByClause(sort + " " + order); } - List users = upmsUserService.selectByExample(upmsUserExample); - return users; + List rows = upmsUserService.selectByExample(upmsUserExample); + long total = upmsUserService.countByExample(upmsUserExample); + Map result = new HashMap<>(); + result.put("rows", rows); + result.put("total", total); + return result; } @ApiOperation(value = "新增用户") diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp index ad2b3d92..68542505 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp @@ -49,13 +49,21 @@ $(function() { detailView: true, detailFormatter: 'detailFormatter', pagination: true, + paginationLoop: false, + sidePagination: 'server', + silentSort: false, + smartDisplay: false, + escape: true, + searchOnEnterKey: true, + idField: 'organizationId', + maintainSelected: true, toolbar: '#toolbar', columns: [ {field: 'state', checkbox: true}, {field: 'organizationId', title: '编号', sortable: true, align: 'center'}, {field: 'name', title: '组织名称'}, {field: 'description', title: '组织描述'}, - {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents'} + {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents', clickToSelect: false} ] }).on('all.bs.table', function (e, name, args) { $('[data-toggle="tooltip"]').tooltip(); diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp index 9591f542..25d5c005 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp @@ -49,6 +49,14 @@ $(function() { detailView: true, detailFormatter: 'detailFormatter', pagination: true, + paginationLoop: false, + sidePagination: 'server', + silentSort: false, + smartDisplay: false, + escape: true, + searchOnEnterKey: true, + idField: 'permissionId', + maintainSelected: true, toolbar: '#toolbar', columns: [ {field: 'state', checkbox: true}, @@ -61,7 +69,7 @@ $(function() { {field: 'uri', title: '路径'}, {field: 'icon', title: '图标', align: 'center', formatter: 'iconFormatter'}, {field: 'status', title: '状态', sortable: true, align: 'center', formatter: 'statusFormatter'}, - {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents'} + {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents', clickToSelect: false} ] }).on('all.bs.table', function (e, name, args) { $('[data-toggle="tooltip"]').tooltip(); diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp index 3b02b231..e2f4058f 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp @@ -49,6 +49,14 @@ $(function() { detailView: true, detailFormatter: 'detailFormatter', pagination: true, + paginationLoop: false, + sidePagination: 'server', + silentSort: false, + smartDisplay: false, + escape: true, + searchOnEnterKey: true, + idField: 'permissionId', + maintainSelected: true, toolbar: '#toolbar', columns: [ {field: 'state', checkbox: true}, @@ -61,7 +69,7 @@ $(function() { {field: 'uri', title: '路径'}, {field: 'icon', title: '图标', align: 'center', formatter: 'iconFormatter'}, {field: 'status', title: '状态', sortable: true, align: 'center', formatter: 'statusFormatter'}, - {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents'} + {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents', clickToSelect: false} ] }).on('all.bs.table', function (e, name, args) { $('[data-toggle="tooltip"]').tooltip(); diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp index 05e7c2f2..a88de3e2 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp @@ -49,6 +49,14 @@ $(function() { detailView: true, detailFormatter: 'detailFormatter', pagination: true, + paginationLoop: false, + sidePagination: 'server', + silentSort: false, + smartDisplay: false, + escape: true, + searchOnEnterKey: true, + idField: 'permissionId', + maintainSelected: true, toolbar: '#toolbar', columns: [ {field: 'state', checkbox: true}, @@ -61,7 +69,7 @@ $(function() { {field: 'uri', title: '路径'}, {field: 'icon', title: '图标', align: 'center', formatter: 'iconFormatter'}, {field: 'status', title: '状态', sortable: true, align: 'center', formatter: 'statusFormatter'}, - {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents'} + {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents', clickToSelect: false} ] }).on('all.bs.table', function (e, name, args) { $('[data-toggle="tooltip"]').tooltip(); diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp index a3531188..01f21dda 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp @@ -49,13 +49,21 @@ $(function() { detailView: true, detailFormatter: 'detailFormatter', pagination: true, + paginationLoop: false, + sidePagination: 'server', + silentSort: false, + smartDisplay: false, + escape: true, + searchOnEnterKey: true, + idField: 'roleId', + maintainSelected: true, toolbar: '#toolbar', columns: [ {field: 'state', checkbox: true}, {field: 'roleId', title: '编号', sortable: true, align: 'center'}, {field: 'name', title: '角色名称'}, {field: 'description', title: '角色描述'}, - {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents'} + {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents', clickToSelect: false} ] }).on('all.bs.table', function (e, name, args) { $('[data-toggle="tooltip"]').tooltip(); diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp index 1d7075df..97bd2924 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp @@ -50,8 +50,8 @@ $(function() { detailFormatter: 'detailFormatter', pagination: true, paginationLoop: false, -// sidePagination: 'server', -// silentSort: false, + sidePagination: 'server', + silentSort: false, smartDisplay: false, escape: true, searchOnEnterKey: true, diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp index b15e3052..c30a6859 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp @@ -49,6 +49,14 @@ $(function() { detailView: true, detailFormatter: 'detailFormatter', pagination: true, + paginationLoop: false, + sidePagination: 'server', + silentSort: false, + smartDisplay: false, + escape: true, + searchOnEnterKey: true, + idField: 'userId', + maintainSelected: true, toolbar: '#toolbar', columns: [ {field: 'state', checkbox: true}, @@ -60,7 +68,7 @@ $(function() { {field: 'email', title: '邮箱'}, {field: 'sex', title: '性别', formatter: 'sexFormatter'}, {field: 'locked', title: '状态', sortable: true, align: 'center', formatter: 'statusFormatter'}, - {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents'} + {field: 'action', title: '操作', align: 'center', formatter: 'actionFormatter', events: 'actionEvents', clickToSelect: false} ] }).on('all.bs.table', function (e, name, args) { $('[data-toggle="tooltip"]').tooltip();