diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java b/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java index 21dc3e31..a9d8075c 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java @@ -178,6 +178,9 @@ public abstract class AbstractMybatisEntityService> ext @SuppressWarnings("unchecked") protected T getById(ID id, Map params) { + if (id == null) + return null; + T entity = null; ValueWrapper entityWrapper = cacheGet(id); diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java b/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java index c2bf74c3..d597c7b2 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/UserServiceImpl.java @@ -164,25 +164,19 @@ public class UserServiceImpl extends AbstractMybatisEntityService protected void saveUserRoles(User user) { - // TODO 完成用户编辑页面的角色编辑功能后再开启 - boolean save = false; + deleteUserRoles(user.getId()); - if (save) + Set roles = user.getRoles(); + if (roles != null && !roles.isEmpty()) { - deleteUserRoles(user.getId()); + Map params = buildParamMap(); - Set roles = user.getRoles(); - if (roles != null && !roles.isEmpty()) + for (Role role : roles) { - Map params = buildParamMap(); + RoleUser ru = new RoleUser(IDUtil.randomIdOnTime20(), role.getId(), user.getId()); + params.put("entity", ru); - for (Role role : roles) - { - RoleUser ru = new RoleUser(IDUtil.randomIdOnTime20(), role.getId(), user.getId()); - params.put("entity", ru); - - insertMybatis("insertUserRole", params); - } + insertMybatis("insertUserRole", params); } } } @@ -239,7 +233,7 @@ public class UserServiceImpl extends AbstractMybatisEntityService rolesNew.add(role); } - obj.setRoles(roles); + obj.setRoles(rolesNew); } return super.postProcessGet(obj); diff --git a/datagear-management/src/test/java/org/datagear/management/impl/UserServiceImplTest.java b/datagear-management/src/test/java/org/datagear/management/impl/UserServiceImplTest.java index bf77b5f2..0f28d5a6 100644 --- a/datagear-management/src/test/java/org/datagear/management/impl/UserServiceImplTest.java +++ b/datagear-management/src/test/java/org/datagear/management/impl/UserServiceImplTest.java @@ -11,9 +11,7 @@ import static org.junit.Assert.assertEquals; import org.datagear.management.domain.User; import org.datagear.management.service.RoleService; -import org.datagear.management.service.RoleUserService; import org.datagear.management.service.impl.RoleServiceImpl; -import org.datagear.management.service.impl.RoleUserServiceImpl; import org.datagear.management.service.impl.UserServiceImpl; import org.junit.Test; @@ -30,9 +28,8 @@ public class UserServiceImplTest extends ServiceImplTestSupport public UserServiceImplTest() { super(); - RoleUserService roleUserService = new RoleUserServiceImpl(getSqlSessionFactory(), getDialect()); RoleService roleService = new RoleServiceImpl(getSqlSessionFactory(), getDialect()); - this.userServiceImpl = new UserServiceImpl(getSqlSessionFactory(), getDialect(), roleUserService, roleService); + this.userServiceImpl = new UserServiceImpl(getSqlSessionFactory(), getDialect(), roleService); } @Test diff --git a/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java b/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java index 02ceb02e..86a16f2a 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/RoleController.java @@ -147,6 +147,7 @@ public class RoleController extends AbstractController { model.addAttribute(KEY_TITLE_MESSAGE_KEY, "role.selectRole"); model.addAttribute(KEY_SELECT_OPERATION, true); + setIsMultipleSelectAttribute(request, model); return "/role/role_grid"; } diff --git a/datagear-web/src/main/java/org/datagear/web/controller/UserController.java b/datagear-web/src/main/java/org/datagear/web/controller/UserController.java index 6c4ec982..371a0d4c 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/UserController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/UserController.java @@ -7,9 +7,17 @@ package org.datagear.web.controller; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Set; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.datagear.management.domain.Role; import org.datagear.management.domain.User; import org.datagear.management.service.SchemaService; import org.datagear.management.service.UserService; @@ -89,6 +97,7 @@ public class UserController extends AbstractController User user = new User(); model.addAttribute("user", user); + model.addAttribute("userRoles", toWriteJsonTemplateModel(toUserRolesList(user))); model.addAttribute(KEY_TITLE_MESSAGE_KEY, "user.addUser"); model.addAttribute(KEY_FORM_ACTION, "saveAdd"); @@ -97,9 +106,12 @@ public class UserController extends AbstractController @RequestMapping(value = "/saveAdd", produces = CONTENT_TYPE_JSON) @ResponseBody - public ResponseEntity saveAdd(HttpServletRequest request, HttpServletResponse response, User user, - @RequestParam("confirmPassword") String confirmPassword) + public ResponseEntity saveAdd(HttpServletRequest request, HttpServletResponse response, + @RequestBody UserForm userForm) { + User user = userForm.getUser(); + String confirmPassword = userForm.getConfirmPassword(); + if (isBlank(user.getName()) || isBlank(user.getPassword())) throw new IllegalInputException(); @@ -126,9 +138,13 @@ public class UserController extends AbstractController public String edit(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model, @RequestParam("id") String id) { - User user = this.userService.getById(id); + User user = this.userService.getByIdNoPassword(id); + + if (user == null) + throw new RecordNotFoundException(); model.addAttribute("user", user); + model.addAttribute("userRoles", toWriteJsonTemplateModel(toUserRolesList(user))); model.addAttribute(KEY_TITLE_MESSAGE_KEY, "user.editUser"); model.addAttribute(KEY_FORM_ACTION, "saveEdit"); @@ -138,8 +154,11 @@ public class UserController extends AbstractController @RequestMapping(value = "/saveEdit", produces = CONTENT_TYPE_JSON) @ResponseBody public ResponseEntity saveEdit(HttpServletRequest request, HttpServletResponse response, - User user, @RequestParam("confirmPassword") String confirmPassword) + @RequestBody UserForm userForm) { + User user = userForm.getUser(); + String confirmPassword = userForm.getConfirmPassword(); + if (isBlank(user.getName())) throw new IllegalInputException(); @@ -164,12 +183,13 @@ public class UserController extends AbstractController public String view(HttpServletRequest request, HttpServletResponse response, org.springframework.ui.Model model, @RequestParam("id") String id) { - User user = this.userService.getById(id); + User user = this.userService.getByIdNoPassword(id); if (user == null) throw new RecordNotFoundException(); model.addAttribute("user", user); + model.addAttribute("userRoles", toWriteJsonTemplateModel(toUserRolesList(user))); model.addAttribute(KEY_TITLE_MESSAGE_KEY, "user.viewUser"); model.addAttribute(KEY_READONLY, true); @@ -239,8 +259,11 @@ public class UserController extends AbstractController @RequestMapping(value = "/savePersonalSet", produces = CONTENT_TYPE_JSON) @ResponseBody public ResponseEntity savePersonalSet(HttpServletRequest request, HttpServletResponse response, - User user, @RequestParam("confirmPassword") String confirmPassword) + @RequestBody UserForm userForm) { + User user = userForm.getUser(); + String confirmPassword = userForm.getConfirmPassword(); + if (isBlank(user.getName()) || !confirmPassword.equals(user.getPassword())) throw new IllegalInputException(); @@ -267,4 +290,58 @@ public class UserController extends AbstractController { return buildMessageCode("user", code); } + + protected List toUserRolesList(User user) + { + List list = new ArrayList(); + + Set roles = (user == null ? null : user.getRoles()); + if (roles != null) + list.addAll(roles); + + Collections.sort(list, new Comparator() + { + @Override + public int compare(Role o1, Role o2) + { + return o1.getName().compareTo(o2.getName()); + } + }); + + return list; + } + + public static class UserForm implements Serializable + { + private static final long serialVersionUID = 1L; + + private User user; + + private String confirmPassword; + + public UserForm() + { + super(); + } + + public User getUser() + { + return user; + } + + public void setUser(User user) + { + this.user = user; + } + + public String getConfirmPassword() + { + return confirmPassword; + } + + public void setConfirmPassword(String confirmPassword) + { + this.confirmPassword = confirmPassword; + } + } } diff --git a/datagear-web/src/main/resources/org/datagear/web/i18n/message.properties b/datagear-web/src/main/resources/org/datagear/web/i18n/message.properties index 705dc258..3757d77a 100644 --- a/datagear-web/src/main/resources/org/datagear/web/i18n/message.properties +++ b/datagear-web/src/main/resources/org/datagear/web/i18n/message.properties @@ -383,6 +383,7 @@ user.realName=昵称 user.email=邮箱 user.admin=管理员 user.createTime=创建日期 +user.roles=角色 user.confirmPassword=确认密码 user.validation.confirmPasswordError=与[密码]项不一致 user.confirmDelete=确定删除选中的用户吗？用户创建的数据源也会被删除 diff --git a/datagear-web/src/main/resources/org/datagear/web/i18n/message_en.properties b/datagear-web/src/main/resources/org/datagear/web/i18n/message_en.properties index 51ca12cb..410469c4 100644 --- a/datagear-web/src/main/resources/org/datagear/web/i18n/message_en.properties +++ b/datagear-web/src/main/resources/org/datagear/web/i18n/message_en.properties @@ -383,6 +383,7 @@ user.realName=Nickname user.email=Email user.admin=Administrator user.createTime=Create time +user.roles=Roles user.confirmPassword=Confirm password user.validation.confirmPasswordError=Must be the same with [Password] user.confirmDelete=Confirm delete selected user? All data related will be deleted also diff --git a/datagear-web/src/main/resources/org/datagear/web/static/css/common.css b/datagear-web/src/main/resources/org/datagear/web/static/css/common.css index a0805434..1cf5565b 100644 --- a/datagear-web/src/main/resources/org/datagear/web/static/css/common.css +++ b/datagear-web/src/main/resources/org/datagear/web/static/css/common.css @@ -355,6 +355,30 @@ form.display-block .form-content .form-item .form-item-value label.error, padding-bottom: 0.3em; } +/*轻型列表*/ +.minor-list{ + height: 10em; + overflow: auto; + padding: 0.41em 0.41em; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} +.minor-list .minor-list-item{ + margin-bottom: 0.3em; + padding: 0.3em 0.3em; +} +.minor-list .minor-list-item .item-content{ + margin-left: 0.41em; +} +.minor-list.deletable-list .minor-list-item .item-content{ + display: inline-block; +} +.minor-list.deletable-list .minor-list-item .delete-icon{ + cursor: pointer; +} + + /*首选操作按钮*/ .ui-button.recommended{ border: 1px solid #0066ff; @@ -1379,6 +1403,15 @@ table.dataTable tbody tr td select{ padding-top: 2em; } +/*用户*/ +.page-form-user{} +.page-form-user .user-roles{ + display: inline-block; +} +.page-form-user .selectUserRoleBtn{ + vertical-align: top; +} + /*驱动信息管理表单页*/ .page-form-driverEntity{ } diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl index 54a4caeb..c9e02bd0 100644 --- a/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl @@ -32,7 +32,7 @@
- +
@@ -40,7 +40,7 @@
- +
@@ -48,7 +48,7 @@
- +
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl index 9b6dcd97..eb8ce535 100644 --- a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl @@ -13,6 +13,7 @@ titleMessageKey 标题标签I18N关键字，不允许null selectOperation 是否选择操作，允许为null --> <#assign selectOperation=(selectOperation!false)> +<#assign isMultipleSelect=(isMultipleSelect!false)> <#include "../include/html_head.ftl"> @@ -117,10 +118,17 @@ selectOperation 是否选择操作，允许为null po.element("input[name=confirmButton]").click(function() { + <#if isMultipleSelect> + po.executeOnSelects(function(rows) + { + po.pageParamCallSelect(true, rows); + }); + <#else> po.executeOnSelect(function(row) { po.pageParamCallSelect(true, row); }); + }); po.initPagination(); diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl index 1ef447c7..1e84c3ee 100644 --- a/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl +++ b/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl @@ -42,7 +42,7 @@ readonly 是否只读操作，允许为null
- +
@@ -50,7 +50,7 @@ readonly 是否只读操作，允许为null
- +
@@ -62,6 +62,18 @@ readonly 是否只读操作，允许为null +
+
+ +
+
+
+
+ <#if !readonly> + + +
+
<#-- 禁用新建管理员账号功能
@@ -90,6 +102,8 @@ readonly 是否只读操作，允许为null