欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 ebb9f15a75562963afd2bce8c089006d686fe7f8 1 个父辈 cd137bd9

新增返回警告消息提示

内嵌 并排对比
正在显示 20 个修改的文件 包含 127 行增加 和 77 行删除
@@ -64,6 +64,6 @@ public class SysOperlogController extends BaseController @@ -64,6 +64,6 @@ public class SysOperlogController extends BaseController
64 public AjaxResult clean() 64 public AjaxResult clean()
65 { 65 {
66 operLogService.cleanOperLog(); 66 operLogService.cleanOperLog();
67 - return AjaxResult.success(); 67 + return success();
68 } 68 }
69 } 69 }
@@ -87,6 +87,6 @@ public class SysUserOnlineController extends BaseController @@ -87,6 +87,6 @@ public class SysUserOnlineController extends BaseController
87 public AjaxResult forceLogout(@PathVariable String tokenId) 87 public AjaxResult forceLogout(@PathVariable String tokenId)
88 { 88 {
89 redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); 89 redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
90 - return AjaxResult.success(); 90 + return success();
91 } 91 }
92 } 92 }
@@ -64,7 +64,7 @@ public class SysConfigController extends BaseController @@ -64,7 +64,7 @@ public class SysConfigController extends BaseController
64 @GetMapping(value = "/{configId}") 64 @GetMapping(value = "/{configId}")
65 public AjaxResult getInfo(@PathVariable Long configId) 65 public AjaxResult getInfo(@PathVariable Long configId)
66 { 66 {
67 - return AjaxResult.success(configService.selectConfigById(configId)); 67 + return success(configService.selectConfigById(configId));
68 } 68 }
69 69
70 /** 70 /**
@@ -73,7 +73,7 @@ public class SysConfigController extends BaseController @@ -73,7 +73,7 @@ public class SysConfigController extends BaseController
73 @GetMapping(value = "/configKey/{configKey}") 73 @GetMapping(value = "/configKey/{configKey}")
74 public AjaxResult getConfigKey(@PathVariable String configKey) 74 public AjaxResult getConfigKey(@PathVariable String configKey)
75 { 75 {
76 - return AjaxResult.success(configService.selectConfigByKey(configKey)); 76 + return success(configService.selectConfigByKey(configKey));
77 } 77 }
78 78
79 /** 79 /**
@@ -86,7 +86,7 @@ public class SysConfigController extends BaseController @@ -86,7 +86,7 @@ public class SysConfigController extends BaseController
86 { 86 {
87 if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) 87 if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
88 { 88 {
89 - return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); 89 + return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
90 } 90 }
91 config.setCreateBy(getUsername()); 91 config.setCreateBy(getUsername());
92 return toAjax(configService.insertConfig(config)); 92 return toAjax(configService.insertConfig(config));
@@ -102,7 +102,7 @@ public class SysConfigController extends BaseController @@ -102,7 +102,7 @@ public class SysConfigController extends BaseController
102 { 102 {
103 if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) 103 if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
104 { 104 {
105 - return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); 105 + return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
106 } 106 }
107 config.setUpdateBy(getUsername()); 107 config.setUpdateBy(getUsername());
108 return toAjax(configService.updateConfig(config)); 108 return toAjax(configService.updateConfig(config));
@@ -129,6 +129,6 @@ public class SysConfigController extends BaseController @@ -129,6 +129,6 @@ public class SysConfigController extends BaseController
129 public AjaxResult refreshCache() 129 public AjaxResult refreshCache()
130 { 130 {
131 configService.resetConfigCache(); 131 configService.resetConfigCache();
132 - return AjaxResult.success(); 132 + return success();
133 } 133 }
134 } 134 }
@@ -42,7 +42,7 @@ public class SysDeptController extends BaseController @@ -42,7 +42,7 @@ public class SysDeptController extends BaseController
42 public AjaxResult list(SysDept dept) 42 public AjaxResult list(SysDept dept)
43 { 43 {
44 List<SysDept> depts = deptService.selectDeptList(dept); 44 List<SysDept> depts = deptService.selectDeptList(dept);
45 - return AjaxResult.success(depts); 45 + return success(depts);
46 } 46 }
47 47
48 /** 48 /**
@@ -54,7 +54,7 @@ public class SysDeptController extends BaseController @@ -54,7 +54,7 @@ public class SysDeptController extends BaseController
54 { 54 {
55 List<SysDept> depts = deptService.selectDeptList(new SysDept()); 55 List<SysDept> depts = deptService.selectDeptList(new SysDept());
56 depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")); 56 depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
57 - return AjaxResult.success(depts); 57 + return success(depts);
58 } 58 }
59 59
60 /** 60 /**
@@ -65,7 +65,7 @@ public class SysDeptController extends BaseController @@ -65,7 +65,7 @@ public class SysDeptController extends BaseController
65 public AjaxResult getInfo(@PathVariable Long deptId) 65 public AjaxResult getInfo(@PathVariable Long deptId)
66 { 66 {
67 deptService.checkDeptDataScope(deptId); 67 deptService.checkDeptDataScope(deptId);
68 - return AjaxResult.success(deptService.selectDeptById(deptId)); 68 + return success(deptService.selectDeptById(deptId));
69 } 69 }
70 70
71 /** 71 /**
@@ -78,7 +78,7 @@ public class SysDeptController extends BaseController @@ -78,7 +78,7 @@ public class SysDeptController extends BaseController
78 { 78 {
79 if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) 79 if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
80 { 80 {
81 - return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); 81 + return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
82 } 82 }
83 dept.setCreateBy(getUsername()); 83 dept.setCreateBy(getUsername());
84 return toAjax(deptService.insertDept(dept)); 84 return toAjax(deptService.insertDept(dept));
@@ -96,15 +96,15 @@ public class SysDeptController extends BaseController @@ -96,15 +96,15 @@ public class SysDeptController extends BaseController
96 deptService.checkDeptDataScope(deptId); 96 deptService.checkDeptDataScope(deptId);
97 if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) 97 if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
98 { 98 {
99 - return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); 99 + return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
100 } 100 }
101 else if (dept.getParentId().equals(deptId)) 101 else if (dept.getParentId().equals(deptId))
102 { 102 {
103 - return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); 103 + return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
104 } 104 }
105 else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) 105 else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
106 { 106 {
107 - return AjaxResult.error("该部门包含未停用的子部门！"); 107 + return error("该部门包含未停用的子部门！");
108 } 108 }
109 dept.setUpdateBy(getUsername()); 109 dept.setUpdateBy(getUsername());
110 return toAjax(deptService.updateDept(dept)); 110 return toAjax(deptService.updateDept(dept));
@@ -120,11 +120,11 @@ public class SysDeptController extends BaseController @@ -120,11 +120,11 @@ public class SysDeptController extends BaseController
120 { 120 {
121 if (deptService.hasChildByDeptId(deptId)) 121 if (deptService.hasChildByDeptId(deptId))
122 { 122 {
123 - return AjaxResult.error("存在下级部门,不允许删除"); 123 + return warn("存在下级部门,不允许删除");
124 } 124 }
125 if (deptService.checkDeptExistUser(deptId)) 125 if (deptService.checkDeptExistUser(deptId))
126 { 126 {
127 - return AjaxResult.error("部门存在用户,不允许删除"); 127 + return warn("部门存在用户,不允许删除");
128 } 128 }
129 deptService.checkDeptDataScope(deptId); 129 deptService.checkDeptDataScope(deptId);
130 return toAjax(deptService.deleteDeptById(deptId)); 130 return toAjax(deptService.deleteDeptById(deptId));
@@ -66,7 +66,7 @@ public class SysDictDataController extends BaseController @@ -66,7 +66,7 @@ public class SysDictDataController extends BaseController
66 @GetMapping(value = "/{dictCode}") 66 @GetMapping(value = "/{dictCode}")
67 public AjaxResult getInfo(@PathVariable Long dictCode) 67 public AjaxResult getInfo(@PathVariable Long dictCode)
68 { 68 {
69 - return AjaxResult.success(dictDataService.selectDictDataById(dictCode)); 69 + return success(dictDataService.selectDictDataById(dictCode));
70 } 70 }
71 71
72 /** 72 /**
@@ -80,7 +80,7 @@ public class SysDictDataController extends BaseController @@ -80,7 +80,7 @@ public class SysDictDataController extends BaseController
80 { 80 {
81 data = new ArrayList<SysDictData>(); 81 data = new ArrayList<SysDictData>();
82 } 82 }
83 - return AjaxResult.success(data); 83 + return success(data);
84 } 84 }
85 85
86 /** 86 /**
@@ -61,7 +61,7 @@ public class SysDictTypeController extends BaseController @@ -61,7 +61,7 @@ public class SysDictTypeController extends BaseController
61 @GetMapping(value = "/{dictId}") 61 @GetMapping(value = "/{dictId}")
62 public AjaxResult getInfo(@PathVariable Long dictId) 62 public AjaxResult getInfo(@PathVariable Long dictId)
63 { 63 {
64 - return AjaxResult.success(dictTypeService.selectDictTypeById(dictId)); 64 + return success(dictTypeService.selectDictTypeById(dictId));
65 } 65 }
66 66
67 /** 67 /**
@@ -74,7 +74,7 @@ public class SysDictTypeController extends BaseController @@ -74,7 +74,7 @@ public class SysDictTypeController extends BaseController
74 { 74 {
75 if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) 75 if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
76 { 76 {
77 - return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); 77 + return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
78 } 78 }
79 dict.setCreateBy(getUsername()); 79 dict.setCreateBy(getUsername());
80 return toAjax(dictTypeService.insertDictType(dict)); 80 return toAjax(dictTypeService.insertDictType(dict));
@@ -90,7 +90,7 @@ public class SysDictTypeController extends BaseController @@ -90,7 +90,7 @@ public class SysDictTypeController extends BaseController
90 { 90 {
91 if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict))) 91 if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
92 { 92 {
93 - return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); 93 + return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
94 } 94 }
95 dict.setUpdateBy(getUsername()); 95 dict.setUpdateBy(getUsername());
96 return toAjax(dictTypeService.updateDictType(dict)); 96 return toAjax(dictTypeService.updateDictType(dict));
@@ -117,7 +117,7 @@ public class SysDictTypeController extends BaseController @@ -117,7 +117,7 @@ public class SysDictTypeController extends BaseController
117 public AjaxResult refreshCache() 117 public AjaxResult refreshCache()
118 { 118 {
119 dictTypeService.resetDictCache(); 119 dictTypeService.resetDictCache();
120 - return AjaxResult.success(); 120 + return success();
121 } 121 }
122 122
123 /** 123 /**
@@ -127,6 +127,6 @@ public class SysDictTypeController extends BaseController @@ -127,6 +127,6 @@ public class SysDictTypeController extends BaseController
127 public AjaxResult optionselect() 127 public AjaxResult optionselect()
128 { 128 {
129 List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll(); 129 List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
130 - return AjaxResult.success(dictTypes); 130 + return success(dictTypes);
131 } 131 }
132 } 132 }
@@ -41,7 +41,7 @@ public class SysMenuController extends BaseController @@ -41,7 +41,7 @@ public class SysMenuController extends BaseController
41 public AjaxResult list(SysMenu menu) 41 public AjaxResult list(SysMenu menu)
42 { 42 {
43 List<SysMenu> menus = menuService.selectMenuList(menu, getUserId()); 43 List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
44 - return AjaxResult.success(menus); 44 + return success(menus);
45 } 45 }
46 46
47 /** 47 /**
@@ -51,7 +51,7 @@ public class SysMenuController extends BaseController @@ -51,7 +51,7 @@ public class SysMenuController extends BaseController
51 @GetMapping(value = "/{menuId}") 51 @GetMapping(value = "/{menuId}")
52 public AjaxResult getInfo(@PathVariable Long menuId) 52 public AjaxResult getInfo(@PathVariable Long menuId)
53 { 53 {
54 - return AjaxResult.success(menuService.selectMenuById(menuId)); 54 + return success(menuService.selectMenuById(menuId));
55 } 55 }
56 56
57 /** 57 /**
@@ -61,7 +61,7 @@ public class SysMenuController extends BaseController @@ -61,7 +61,7 @@ public class SysMenuController extends BaseController
61 public AjaxResult treeselect(SysMenu menu) 61 public AjaxResult treeselect(SysMenu menu)
62 { 62 {
63 List<SysMenu> menus = menuService.selectMenuList(menu, getUserId()); 63 List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
64 - return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); 64 + return success(menuService.buildMenuTreeSelect(menus));
65 } 65 }
66 66
67 /** 67 /**
@@ -87,11 +87,11 @@ public class SysMenuController extends BaseController @@ -87,11 +87,11 @@ public class SysMenuController extends BaseController
87 { 87 {
88 if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) 88 if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
89 { 89 {
90 - return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); 90 + return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
91 } 91 }
92 else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) 92 else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
93 { 93 {
94 - return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); 94 + return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
95 } 95 }
96 menu.setCreateBy(getUsername()); 96 menu.setCreateBy(getUsername());
97 return toAjax(menuService.insertMenu(menu)); 97 return toAjax(menuService.insertMenu(menu));
@@ -107,15 +107,15 @@ public class SysMenuController extends BaseController @@ -107,15 +107,15 @@ public class SysMenuController extends BaseController
107 { 107 {
108 if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu))) 108 if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
109 { 109 {
110 - return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); 110 + return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
111 } 111 }
112 else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) 112 else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
113 { 113 {
114 - return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); 114 + return error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
115 } 115 }
116 else if (menu.getMenuId().equals(menu.getParentId())) 116 else if (menu.getMenuId().equals(menu.getParentId()))
117 { 117 {
118 - return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); 118 + return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
119 } 119 }
120 menu.setUpdateBy(getUsername()); 120 menu.setUpdateBy(getUsername());
121 return toAjax(menuService.updateMenu(menu)); 121 return toAjax(menuService.updateMenu(menu));
@@ -131,11 +131,11 @@ public class SysMenuController extends BaseController @@ -131,11 +131,11 @@ public class SysMenuController extends BaseController
131 { 131 {
132 if (menuService.hasChildByMenuId(menuId)) 132 if (menuService.hasChildByMenuId(menuId))
133 { 133 {
134 - return AjaxResult.error("存在子菜单,不允许删除"); 134 + return warn("存在子菜单,不允许删除");
135 } 135 }
136 if (menuService.checkMenuExistRole(menuId)) 136 if (menuService.checkMenuExistRole(menuId))
137 { 137 {
138 - return AjaxResult.error("菜单已分配,不允许删除"); 138 + return warn("菜单已分配,不允许删除");
139 } 139 }
140 return toAjax(menuService.deleteMenuById(menuId)); 140 return toAjax(menuService.deleteMenuById(menuId));
141 } 141 }
@@ -51,7 +51,7 @@ public class SysNoticeController extends BaseController @@ -51,7 +51,7 @@ public class SysNoticeController extends BaseController
51 @GetMapping(value = "/{noticeId}") 51 @GetMapping(value = "/{noticeId}")
52 public AjaxResult getInfo(@PathVariable Long noticeId) 52 public AjaxResult getInfo(@PathVariable Long noticeId)
53 { 53 {
54 - return AjaxResult.success(noticeService.selectNoticeById(noticeId)); 54 + return success(noticeService.selectNoticeById(noticeId));
55 } 55 }
56 56
57 /** 57 /**
@@ -64,7 +64,7 @@ public class SysPostController extends BaseController @@ -64,7 +64,7 @@ public class SysPostController extends BaseController
64 @GetMapping(value = "/{postId}") 64 @GetMapping(value = "/{postId}")
65 public AjaxResult getInfo(@PathVariable Long postId) 65 public AjaxResult getInfo(@PathVariable Long postId)
66 { 66 {
67 - return AjaxResult.success(postService.selectPostById(postId)); 67 + return success(postService.selectPostById(postId));
68 } 68 }
69 69
70 /** 70 /**
@@ -77,11 +77,11 @@ public class SysPostController extends BaseController @@ -77,11 +77,11 @@ public class SysPostController extends BaseController
77 { 77 {
78 if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) 78 if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
79 { 79 {
80 - return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); 80 + return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
81 } 81 }
82 else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) 82 else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
83 { 83 {
84 - return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); 84 + return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
85 } 85 }
86 post.setCreateBy(getUsername()); 86 post.setCreateBy(getUsername());
87 return toAjax(postService.insertPost(post)); 87 return toAjax(postService.insertPost(post));
@@ -97,11 +97,11 @@ public class SysPostController extends BaseController @@ -97,11 +97,11 @@ public class SysPostController extends BaseController
97 { 97 {
98 if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post))) 98 if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
99 { 99 {
100 - return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); 100 + return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
101 } 101 }
102 else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post))) 102 else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
103 { 103 {
104 - return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); 104 + return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
105 } 105 }
106 post.setUpdateBy(getUsername()); 106 post.setUpdateBy(getUsername());
107 return toAjax(postService.updatePost(post)); 107 return toAjax(postService.updatePost(post));
@@ -125,6 +125,6 @@ public class SysPostController extends BaseController @@ -125,6 +125,6 @@ public class SysPostController extends BaseController
125 public AjaxResult optionselect() 125 public AjaxResult optionselect()
126 { 126 {
127 List<SysPost> posts = postService.selectPostAll(); 127 List<SysPost> posts = postService.selectPostAll();
128 - return AjaxResult.success(posts); 128 + return success(posts);
129 } 129 }
130 } 130 }
@@ -66,12 +66,12 @@ public class SysProfileController extends BaseController @@ -66,12 +66,12 @@ public class SysProfileController extends BaseController
66 if (StringUtils.isNotEmpty(user.getPhonenumber()) 66 if (StringUtils.isNotEmpty(user.getPhonenumber())
67 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) 67 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
68 { 68 {
69 - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); 69 + return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
70 } 70 }
71 if (StringUtils.isNotEmpty(user.getEmail()) 71 if (StringUtils.isNotEmpty(user.getEmail())
72 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) 72 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
73 { 73 {
74 - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); 74 + return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
75 } 75 }
76 user.setUserId(sysUser.getUserId()); 76 user.setUserId(sysUser.getUserId());
77 user.setPassword(null); 77 user.setPassword(null);
@@ -85,9 +85,9 @@ public class SysProfileController extends BaseController @@ -85,9 +85,9 @@ public class SysProfileController extends BaseController
85 sysUser.setEmail(user.getEmail()); 85 sysUser.setEmail(user.getEmail());
86 sysUser.setSex(user.getSex()); 86 sysUser.setSex(user.getSex());
87 tokenService.setLoginUser(loginUser); 87 tokenService.setLoginUser(loginUser);
88 - return AjaxResult.success(); 88 + return success();
89 } 89 }
90 - return AjaxResult.error("修改个人信息异常，请联系管理员"); 90 + return error("修改个人信息异常，请联系管理员");
91 } 91 }
92 92
93 /** 93 /**
@@ -102,20 +102,20 @@ public class SysProfileController extends BaseController @@ -102,20 +102,20 @@ public class SysProfileController extends BaseController
102 String password = loginUser.getPassword(); 102 String password = loginUser.getPassword();
103 if (!SecurityUtils.matchesPassword(oldPassword, password)) 103 if (!SecurityUtils.matchesPassword(oldPassword, password))
104 { 104 {
105 - return AjaxResult.error("修改密码失败，旧密码错误"); 105 + return error("修改密码失败，旧密码错误");
106 } 106 }
107 if (SecurityUtils.matchesPassword(newPassword, password)) 107 if (SecurityUtils.matchesPassword(newPassword, password))
108 { 108 {
109 - return AjaxResult.error("新密码不能与旧密码相同"); 109 + return error("新密码不能与旧密码相同");
110 } 110 }
111 if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) 111 if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
112 { 112 {
113 // 更新缓存用户密码 113 // 更新缓存用户密码
114 loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); 114 loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
115 tokenService.setLoginUser(loginUser); 115 tokenService.setLoginUser(loginUser);
116 - return AjaxResult.success(); 116 + return success();
117 } 117 }
118 - return AjaxResult.error("修改密码异常，请联系管理员"); 118 + return error("修改密码异常，请联系管理员");
119 } 119 }
120 120
121 /** 121 /**
@@ -139,6 +139,6 @@ public class SysProfileController extends BaseController @@ -139,6 +139,6 @@ public class SysProfileController extends BaseController
139 return ajax; 139 return ajax;
140 } 140 }
141 } 141 }
142 - return AjaxResult.error("上传图片异常，请联系管理员"); 142 + return error("上传图片异常，请联系管理员");
143 } 143 }
144 } 144 }
@@ -83,7 +83,7 @@ public class SysRoleController extends BaseController @@ -83,7 +83,7 @@ public class SysRoleController extends BaseController
83 public AjaxResult getInfo(@PathVariable Long roleId) 83 public AjaxResult getInfo(@PathVariable Long roleId)
84 { 84 {
85 roleService.checkRoleDataScope(roleId); 85 roleService.checkRoleDataScope(roleId);
86 - return AjaxResult.success(roleService.selectRoleById(roleId)); 86 + return success(roleService.selectRoleById(roleId));
87 } 87 }
88 88
89 /** 89 /**
@@ -96,11 +96,11 @@ public class SysRoleController extends BaseController @@ -96,11 +96,11 @@ public class SysRoleController extends BaseController
96 { 96 {
97 if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) 97 if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
98 { 98 {
99 - return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); 99 + return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
100 } 100 }
101 else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) 101 else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
102 { 102 {
103 - return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); 103 + return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
104 } 104 }
105 role.setCreateBy(getUsername()); 105 role.setCreateBy(getUsername());
106 return toAjax(roleService.insertRole(role)); 106 return toAjax(roleService.insertRole(role));
@@ -119,11 +119,11 @@ public class SysRoleController extends BaseController @@ -119,11 +119,11 @@ public class SysRoleController extends BaseController
119 roleService.checkRoleDataScope(role.getRoleId()); 119 roleService.checkRoleDataScope(role.getRoleId());
120 if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) 120 if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
121 { 121 {
122 - return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); 122 + return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
123 } 123 }
124 else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) 124 else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
125 { 125 {
126 - return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); 126 + return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
127 } 127 }
128 role.setUpdateBy(getUsername()); 128 role.setUpdateBy(getUsername());
129 129
@@ -137,9 +137,9 @@ public class SysRoleController extends BaseController @@ -137,9 +137,9 @@ public class SysRoleController extends BaseController
137 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName())); 137 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
138 tokenService.setLoginUser(loginUser); 138 tokenService.setLoginUser(loginUser);
139 } 139 }
140 - return AjaxResult.success(); 140 + return success();
141 } 141 }
142 - return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); 142 + return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
143 } 143 }
144 144
145 /** 145 /**
@@ -187,7 +187,7 @@ public class SysRoleController extends BaseController @@ -187,7 +187,7 @@ public class SysRoleController extends BaseController
187 @GetMapping("/optionselect") 187 @GetMapping("/optionselect")
188 public AjaxResult optionselect() 188 public AjaxResult optionselect()
189 { 189 {
190 - return AjaxResult.success(roleService.selectRoleAll()); 190 + return success(roleService.selectRoleAll());
191 } 191 }
192 192
193 /** 193 /**
@@ -85,7 +85,7 @@ public class SysUserController extends BaseController @@ -85,7 +85,7 @@ public class SysUserController extends BaseController
85 List<SysUser> userList = util.importExcel(file.getInputStream()); 85 List<SysUser> userList = util.importExcel(file.getInputStream());
86 String operName = getUsername(); 86 String operName = getUsername();
87 String message = userService.importUser(userList, updateSupport, operName); 87 String message = userService.importUser(userList, updateSupport, operName);
88 - return AjaxResult.success(message); 88 + return success(message);
89 } 89 }
90 90
91 @PostMapping("/importTemplate") 91 @PostMapping("/importTemplate")
@@ -127,17 +127,17 @@ public class SysUserController extends BaseController @@ -127,17 +127,17 @@ public class SysUserController extends BaseController
127 { 127 {
128 if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) 128 if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
129 { 129 {
130 - return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); 130 + return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
131 } 131 }
132 else if (StringUtils.isNotEmpty(user.getPhonenumber()) 132 else if (StringUtils.isNotEmpty(user.getPhonenumber())
133 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) 133 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
134 { 134 {
135 - return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); 135 + return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
136 } 136 }
137 else if (StringUtils.isNotEmpty(user.getEmail()) 137 else if (StringUtils.isNotEmpty(user.getEmail())
138 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) 138 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
139 { 139 {
140 - return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); 140 + return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
141 } 141 }
142 user.setCreateBy(getUsername()); 142 user.setCreateBy(getUsername());
143 user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); 143 user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -156,17 +156,17 @@ public class SysUserController extends BaseController @@ -156,17 +156,17 @@ public class SysUserController extends BaseController
156 userService.checkUserDataScope(user.getUserId()); 156 userService.checkUserDataScope(user.getUserId());
157 if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) 157 if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
158 { 158 {
159 - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，登录账号已存在"); 159 + return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
160 } 160 }
161 else if (StringUtils.isNotEmpty(user.getPhonenumber()) 161 else if (StringUtils.isNotEmpty(user.getPhonenumber())
162 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) 162 && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
163 { 163 {
164 - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); 164 + return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
165 } 165 }
166 else if (StringUtils.isNotEmpty(user.getEmail()) 166 else if (StringUtils.isNotEmpty(user.getEmail())
167 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) 167 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
168 { 168 {
169 - return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); 169 + return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
170 } 170 }
171 user.setUpdateBy(getUsername()); 171 user.setUpdateBy(getUsername());
172 return toAjax(userService.updateUser(user)); 172 return toAjax(userService.updateUser(user));
@@ -251,6 +251,6 @@ public class SysUserController extends BaseController @@ -251,6 +251,6 @@ public class SysUserController extends BaseController
251 @GetMapping("/deptTree") 251 @GetMapping("/deptTree")
252 public AjaxResult deptTree(SysDept dept) 252 public AjaxResult deptTree(SysDept dept)
253 { 253 {
254 - return AjaxResult.success(deptService.selectDeptTreeList(dept)); 254 + return success(deptService.selectDeptTreeList(dept));
255 } 255 }
256 } 256 }
@@ -86,4 +86,9 @@ public class HttpStatus @@ -86,4 +86,9 @@ public class HttpStatus
86 * 接口未实现 86 * 接口未实现
87 */ 87 */
88 public static final int NOT_IMPLEMENTED = 501; 88 public static final int NOT_IMPLEMENTED = 501;
  89 +
  90 + /**
  91 + * 系统警告消息
  92 + */
  93 + public static final int WARN = 601;
89 } 94 }
@@ -113,6 +113,14 @@ public class BaseController @@ -113,6 +113,14 @@ public class BaseController
113 { 113 {
114 return AjaxResult.success(message); 114 return AjaxResult.success(message);
115 } 115 }
  116 +
  117 + /**
  118 + * 返回成功消息
  119 + */
  120 + public AjaxResult success(Object data)
  121 + {
  122 + return AjaxResult.success(data);
  123 + }
116 124
117 /** 125 /**
118 * 返回失败消息 126 * 返回失败消息
@@ -123,6 +131,14 @@ public class BaseController @@ -123,6 +131,14 @@ public class BaseController
123 } 131 }
124 132
125 /** 133 /**
  134 + * 返回警告消息
  135 + */
  136 + public AjaxResult warn(String message)
  137 + {
  138 + return AjaxResult.warn(message);
  139 + }
  140 +
  141 + /**
126 * 响应返回结果 142 * 响应返回结果
127 * 143 *
128 * @param rows 影响行数 144 * @param rows 影响行数
@@ -102,6 +102,29 @@ public class AjaxResult extends HashMap<String, Object> @@ -102,6 +102,29 @@ public class AjaxResult extends HashMap<String, Object>
102 } 102 }
103 103
104 /** 104 /**
  105 + * 返回警告消息
  106 + *
  107 + * @param msg 返回内容
  108 + * @return 警告消息
  109 + */
  110 + public static AjaxResult warn(String msg)
  111 + {
  112 + return AjaxResult.warn(msg, null);
  113 + }
  114 +
  115 + /**
  116 + * 返回警告消息
  117 + *
  118 + * @param msg 返回内容
  119 + * @param data 数据对象
  120 + * @return 警告消息
  121 + */
  122 + public static AjaxResult warn(String msg, Object data)
  123 + {
  124 + return new AjaxResult(HttpStatus.WARN, msg, data);
  125 + }
  126 +
  127 + /**
105 * 返回错误消息 128 * 返回错误消息
106 * 129 *
107 * @return 130 * @return
@@ -69,7 +69,7 @@ public class GenController extends BaseController @@ -69,7 +69,7 @@ public class GenController extends BaseController
69 map.put("info", table); 69 map.put("info", table);
70 map.put("rows", list); 70 map.put("rows", list);
71 map.put("tables", tables); 71 map.put("tables", tables);
72 - return AjaxResult.success(map); 72 + return success(map);
73 } 73 }
74 74
75 /** 75 /**
@@ -110,7 +110,7 @@ public class GenController extends BaseController @@ -110,7 +110,7 @@ public class GenController extends BaseController
110 // 查询表信息 110 // 查询表信息
111 List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames); 111 List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
112 genTableService.importGenTable(tableList); 112 genTableService.importGenTable(tableList);
113 - return AjaxResult.success(); 113 + return success();
114 } 114 }
115 115
116 /** 116 /**
@@ -123,7 +123,7 @@ public class GenController extends BaseController @@ -123,7 +123,7 @@ public class GenController extends BaseController
123 { 123 {
124 genTableService.validateEdit(genTable); 124 genTableService.validateEdit(genTable);
125 genTableService.updateGenTable(genTable); 125 genTableService.updateGenTable(genTable);
126 - return AjaxResult.success(); 126 + return success();
127 } 127 }
128 128
129 /** 129 /**
@@ -135,7 +135,7 @@ public class GenController extends BaseController @@ -135,7 +135,7 @@ public class GenController extends BaseController
135 public AjaxResult remove(@PathVariable Long[] tableIds) 135 public AjaxResult remove(@PathVariable Long[] tableIds)
136 { 136 {
137 genTableService.deleteGenTableByIds(tableIds); 137 genTableService.deleteGenTableByIds(tableIds);
138 - return AjaxResult.success(); 138 + return success();
139 } 139 }
140 140
141 /** 141 /**
@@ -146,7 +146,7 @@ public class GenController extends BaseController @@ -146,7 +146,7 @@ public class GenController extends BaseController
146 public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException 146 public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
147 { 147 {
148 Map<String, String> dataMap = genTableService.previewCode(tableId); 148 Map<String, String> dataMap = genTableService.previewCode(tableId);
149 - return AjaxResult.success(dataMap); 149 + return success(dataMap);
150 } 150 }
151 151
152 /** 152 /**
@@ -170,7 +170,7 @@ public class GenController extends BaseController @@ -170,7 +170,7 @@ public class GenController extends BaseController
170 public AjaxResult genCode(@PathVariable("tableName") String tableName) 170 public AjaxResult genCode(@PathVariable("tableName") String tableName)
171 { 171 {
172 genTableService.generatorCode(tableName); 172 genTableService.generatorCode(tableName);
173 - return AjaxResult.success(); 173 + return success();
174 } 174 }
175 175
176 /** 176 /**
@@ -182,7 +182,7 @@ public class GenController extends BaseController @@ -182,7 +182,7 @@ public class GenController extends BaseController
182 public AjaxResult synchDb(@PathVariable("tableName") String tableName) 182 public AjaxResult synchDb(@PathVariable("tableName") String tableName)
183 { 183 {
184 genTableService.synchDb(tableName); 184 genTableService.synchDb(tableName);
185 - return AjaxResult.success(); 185 + return success();
186 } 186 }
187 187
188 /** 188 /**
@@ -53,7 +53,7 @@ public class ${ClassName}Controller extends BaseController @@ -53,7 +53,7 @@ public class ${ClassName}Controller extends BaseController
53 public AjaxResult list(${ClassName} ${className}) 53 public AjaxResult list(${ClassName} ${className})
54 { 54 {
55 List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); 55 List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
56 - return AjaxResult.success(list); 56 + return success(list);
57 } 57 }
58 #end 58 #end
59 59
@@ -77,7 +77,7 @@ public class ${ClassName}Controller extends BaseController @@ -77,7 +77,7 @@ public class ${ClassName}Controller extends BaseController
77 @GetMapping(value = "/{${pkColumn.javaField}}") 77 @GetMapping(value = "/{${pkColumn.javaField}}")
78 public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) 78 public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
79 { 79 {
80 - return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); 80 + return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
81 } 81 }
82 82
83 /** 83 /**
@@ -71,7 +71,7 @@ public class SysJobController extends BaseController @@ -71,7 +71,7 @@ public class SysJobController extends BaseController
71 @GetMapping(value = "/{jobId}") 71 @GetMapping(value = "/{jobId}")
72 public AjaxResult getInfo(@PathVariable("jobId") Long jobId) 72 public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
73 { 73 {
74 - return AjaxResult.success(jobService.selectJobById(jobId)); 74 + return success(jobService.selectJobById(jobId));
75 } 75 }
76 76
77 /** 77 /**
@@ -63,7 +63,7 @@ public class SysJobLogController extends BaseController @@ -63,7 +63,7 @@ public class SysJobLogController extends BaseController
63 @GetMapping(value = "/{configId}") 63 @GetMapping(value = "/{configId}")
64 public AjaxResult getInfo(@PathVariable Long jobLogId) 64 public AjaxResult getInfo(@PathVariable Long jobLogId)
65 { 65 {
66 - return AjaxResult.success(jobLogService.selectJobLogById(jobLogId)); 66 + return success(jobLogService.selectJobLogById(jobLogId));
67 } 67 }
68 68
69 69
@@ -87,6 +87,6 @@ public class SysJobLogController extends BaseController @@ -87,6 +87,6 @@ public class SysJobLogController extends BaseController
87 public AjaxResult clean() 87 public AjaxResult clean()
88 { 88 {
89 jobLogService.cleanJobLog(); 89 jobLogService.cleanJobLog();
90 - return AjaxResult.success(); 90 + return success();
91 } 91 }
92 } 92 }
@@ -99,6 +99,12 @@ service.interceptors.response.use(res => { @@ -99,6 +99,12 @@ service.interceptors.response.use(res => {
99 type: 'error' 99 type: 'error'
100 }) 100 })
101 return Promise.reject(new Error(msg)) 101 return Promise.reject(new Error(msg))
  102 + } else if (code === 601) {
  103 + Message({
  104 + message: msg,
  105 + type: 'warning'
  106 + })
  107 + return Promise.reject('error')
102 } else if (code !== 200) { 108 } else if (code !== 200) {
103 Notification.error({ 109 Notification.error({
104 title: msg 110 title: msg