gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查漏补缺 addMessage() messageType;

Browse Source
This commit is contained in:
zhangwq
2018-12-13 14:01:06 +08:00
parent 6dab8a5950
commit 46efc3320d
82 changed files with 174 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/sys/AreaController.java
View File

@@ -70,7 +70,7 @@ public class AreaController extends BaseController {
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SysArea sysArea, Model model, RedirectAttributes redirectAttributes) {
areaService.saveOrUpdate(sysArea);
addMessage(redirectAttributes, "保存区域'" + sysArea.getName() + "'成功");
addMessage(redirectAttributes,"success", "保存区域'" + sysArea.getName() + "'成功");
String id = sysArea.getParentId().equals(0l) ? "" : String.valueOf(sysArea.getParentId());
return "redirect:" + adminPath + "/sys/area/list?id="+id+"&parentIds="+sysArea.getParent().getParentIds();
@@ -82,7 +82,7 @@ public class AreaController extends BaseController {
public String delete(SysArea area, RedirectAttributes redirectAttributes) {
areaService.delete(area);
addMessage(redirectAttributes, "删除区域成功");
addMessage(redirectAttributes,"success", "删除区域成功");
return "redirect:" + adminPath + "/sys/area/list?id="+area.getParentId()+"&parentIds="+area.getParent().getParentIds();
}

8
src/main/java/com/nis/web/controller/sys/DictController.java
View File

@@ -68,10 +68,10 @@ public class DictController extends BaseController {
dictService.saveOrUpdate(sysDictName);
//删除字典缓存
CacheUtils.remove(Constants.CACHE_DICT_MAP);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "save_failed");
addMessage(redirectAttributes,"error", "save_failed");
}
return "redirect:" + adminPath + "/sys/dict/list";
@@ -85,10 +85,10 @@ public class DictController extends BaseController {
dictService.deleteDict(id);
//删除字典缓存
CacheUtils.remove(Constants.CACHE_DICT_MAP);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}

6
src/main/java/com/nis/web/controller/sys/MenuController.java
View File

@@ -71,12 +71,12 @@ public class MenuController extends BaseController {
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SysMenu menu, Model model, RedirectAttributes redirectAttributes) {
if(!UserUtils.getUser().isAdmin()){
addMessage(redirectAttributes, "越权操作，只有超级管理员才能添加或修改数据！");
addMessage(redirectAttributes,"error", "越权操作，只有超级管理员才能添加或修改数据！");
return "redirect:" + adminPath + "/sys/role/?repage";
}
menuService.saveOrUpdateMenu(menu);
addMessage(redirectAttributes, "保存菜单'" + menu.getName() + "'成功");
addMessage(redirectAttributes,"success", "保存菜单'" + menu.getName() + "'成功");
return "redirect:" + adminPath + "/sys/menu/";
}
@@ -89,7 +89,7 @@ public class MenuController extends BaseController {
// addMessage(redirectAttributes, "删除菜单失败, 不允许删除顶级菜单或编号为空");
// }else{
menuService.deleteMenu(menu);
addMessage(redirectAttributes, "删除菜单成功");
addMessage(redirectAttributes,"success", "删除菜单成功");
// }
return "redirect:" + adminPath + "/sys/menu/";
}

4
src/main/java/com/nis/web/controller/sys/OfficeController.java
View File

@@ -99,7 +99,7 @@ public class OfficeController extends BaseController {
public String saveOrUpdate(SysOffice office, Model model, RedirectAttributes redirectAttributes) {
officeService.saveOrUpdate(office);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());
return "redirect:" + adminPath + "/sys/office/list?id="+id+"&parentIds="+office.getParentIds();
@@ -114,7 +114,7 @@ public class OfficeController extends BaseController {
// addMessage(redirectAttributes, "删除机构失败, 不允许删除顶级机构或编号空");
// }else{
officeService.delete(office);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
// }
String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());

14
src/main/java/com/nis/web/controller/sys/RoleController.java
View File

@@ -143,11 +143,11 @@ public class RoleController extends BaseController {
public String saveOrUpdate(SysRole role, Model model, RedirectAttributes redirectAttributes) {
if (!"true".equals(checkName(role.getOldName(), role.getName()))){
addMessage(model, "save_failed");
addMessage(model,"error", "save_failed");
return form(role, model);
}
roleService.saveOrUpdate(role);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/sys/role/?repage";
}
@@ -155,7 +155,7 @@ public class RoleController extends BaseController {
@RequestMapping(value = "delete")
public String delete(SysRole role, RedirectAttributes redirectAttributes) {
roleService.deleteRole(role);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
return "redirect:" + adminPath + "/sys/role/?repage";
}
@@ -195,16 +195,16 @@ public class RoleController extends BaseController {
if (UserUtils.getUser().getId().equals(userId)) {
/*format(getMsgProp().get("single_file_upload_size_error").toString(),
role.getName(),user.getName());*/
addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
addMessage(redirectAttributes,"error", "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
}else {
if (user.getUserRoleList().size() <= 1){
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
}else{
Boolean flag = systemService.outUserInRole(role, user);
if (!flag) {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
}else {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
addMessage(redirectAttributes,"success", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
}
}
}

12
src/main/java/com/nis/web/controller/sys/UserController.java
View File

@@ -97,7 +97,7 @@ public class UserController extends BaseController{
return form(user, model);
}*/
if (!"true".equals(checkLoginName(user.getOldLoginId(), user.getLoginId()))){
addMessage(model, "save_failed");
addMessage(model,"error", "save_failed");
return form(user, model);
}
// 角色数据有效性验证，过滤不在授权内的角色
@@ -115,7 +115,7 @@ public class UserController extends BaseController{
if (user.getLoginId().equals(UserUtils.getUser().getLoginId())){
UserUtils.clearCache();
}
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/sys/user/list?repage";
}
@@ -125,12 +125,12 @@ public class UserController extends BaseController{
public String delete(SysUser user, RedirectAttributes redirectAttributes) {
if (UserUtils.getUser().getId().equals(user.getId())){
addMessage(redirectAttributes, "delete_failed");
addMessage(redirectAttributes,"error", "delete_failed");
}else if (user.isAdmin()){
addMessage(redirectAttributes, "delete_failed_admin");
addMessage(redirectAttributes,"error", "delete_failed_admin");
}else{
userService.deleteUser(user);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
}
return "redirect:" + adminPath + "/sys/user/list?repage";
}
@@ -205,7 +205,7 @@ public class UserController extends BaseController{
new ExportExcel("用户数据", SysUser.class).setDataList(getMsgProp(),page.getList(),null).write(response, fileName).dispose();
return null;
} catch (Exception e) {
addMessage(redirectAttributes, "导出用户失败！失败信息："+e.getMessage());
addMessage(redirectAttributes,"error", "导出用户失败！失败信息："+e.getMessage());
}
return "redirect:" + adminPath + "/sys/user/list?repage";
}