Commit 0f4e94583419d9798695b97e3df66033ec83af85
1 parent
29686df4
规范化代码
Showing
4 changed files
with
0 additions
and
17 deletions
jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -57,7 +57,6 @@ public class SysDepartController { | @@ -57,7 +57,6 @@ public class SysDepartController { | ||
57 | * @return | 57 | * @return |
58 | */ | 58 | */ |
59 | @RequestMapping(value = "/add", method = RequestMethod.POST) | 59 | @RequestMapping(value = "/add", method = RequestMethod.POST) |
60 | - | ||
61 | public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) { | 60 | public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) { |
62 | Result<SysDepart> result = new Result<SysDepart>(); | 61 | Result<SysDepart> result = new Result<SysDepart>(); |
63 | String username = JwtUtil.getUserNameByToken(request); | 62 | String username = JwtUtil.getUserNameByToken(request); |
@@ -80,7 +79,6 @@ public class SysDepartController { | @@ -80,7 +79,6 @@ public class SysDepartController { | ||
80 | * @return | 79 | * @return |
81 | */ | 80 | */ |
82 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) | 81 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) |
83 | - | ||
84 | public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) { | 82 | public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) { |
85 | 83 | ||
86 | String username = JwtUtil.getUserNameByToken(request); | 84 | String username = JwtUtil.getUserNameByToken(request); |
@@ -105,7 +103,6 @@ public class SysDepartController { | @@ -105,7 +103,6 @@ public class SysDepartController { | ||
105 | * @return | 103 | * @return |
106 | */ | 104 | */ |
107 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) | 105 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) |
108 | - | ||
109 | public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) { | 106 | public Result<SysDepart> delete(@RequestParam(name="id",required=true) String id) { |
110 | 107 | ||
111 | Result<SysDepart> result = new Result<SysDepart>(); | 108 | Result<SysDepart> result = new Result<SysDepart>(); |
@@ -129,7 +126,6 @@ public class SysDepartController { | @@ -129,7 +126,6 @@ public class SysDepartController { | ||
129 | * @return | 126 | * @return |
130 | */ | 127 | */ |
131 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) | 128 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) |
132 | - | ||
133 | public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { | 129 | public Result<SysDepart> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
134 | 130 | ||
135 | Result<SysDepart> result = new Result<SysDepart>(); | 131 | Result<SysDepart> result = new Result<SysDepart>(); |
jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -109,7 +109,6 @@ public class SysPermissionController { | @@ -109,7 +109,6 @@ public class SysPermissionController { | ||
109 | 109 | ||
110 | 110 | ||
111 | @RequestMapping(value = "/add", method = RequestMethod.POST) | 111 | @RequestMapping(value = "/add", method = RequestMethod.POST) |
112 | - | ||
113 | public Result<SysPermission> add(@RequestBody SysPermission permission) { | 112 | public Result<SysPermission> add(@RequestBody SysPermission permission) { |
114 | Result<SysPermission> result = new Result<SysPermission>(); | 113 | Result<SysPermission> result = new Result<SysPermission>(); |
115 | try { | 114 | try { |
@@ -125,7 +124,6 @@ public class SysPermissionController { | @@ -125,7 +124,6 @@ public class SysPermissionController { | ||
125 | } | 124 | } |
126 | 125 | ||
127 | @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) | 126 | @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) |
128 | - | ||
129 | public Result<SysPermission> edit(@RequestBody SysPermission permission) { | 127 | public Result<SysPermission> edit(@RequestBody SysPermission permission) { |
130 | Result<SysPermission> result = new Result<>(); | 128 | Result<SysPermission> result = new Result<>(); |
131 | try { | 129 | try { |
@@ -141,7 +139,6 @@ public class SysPermissionController { | @@ -141,7 +139,6 @@ public class SysPermissionController { | ||
141 | } | 139 | } |
142 | 140 | ||
143 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) | 141 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) |
144 | - | ||
145 | public Result<SysPermission> delete(@RequestParam(name="id",required=true) String id) { | 142 | public Result<SysPermission> delete(@RequestParam(name="id",required=true) String id) { |
146 | Result<SysPermission> result = new Result<>(); | 143 | Result<SysPermission> result = new Result<>(); |
147 | try { | 144 | try { |
@@ -157,7 +154,6 @@ public class SysPermissionController { | @@ -157,7 +154,6 @@ public class SysPermissionController { | ||
157 | 154 | ||
158 | 155 | ||
159 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) | 156 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) |
160 | - | ||
161 | public Result<SysPermission> deleteBatch(@RequestParam(name="ids",required=true) String ids) { | 157 | public Result<SysPermission> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
162 | Result<SysPermission> result = new Result<>(); | 158 | Result<SysPermission> result = new Result<>(); |
163 | try { | 159 | try { |
@@ -251,7 +247,6 @@ public class SysPermissionController { | @@ -251,7 +247,6 @@ public class SysPermissionController { | ||
251 | * @return | 247 | * @return |
252 | */ | 248 | */ |
253 | @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST) | 249 | @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST) |
254 | - | ||
255 | public Result<String> saveRolePermission(@RequestBody JSONObject json) { | 250 | public Result<String> saveRolePermission(@RequestBody JSONObject json) { |
256 | Result<String> result = new Result<>(); | 251 | Result<String> result = new Result<>(); |
257 | try { | 252 | try { |
jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
@@ -126,7 +126,6 @@ public class SysRoleController { | @@ -126,7 +126,6 @@ public class SysRoleController { | ||
126 | * @return | 126 | * @return |
127 | */ | 127 | */ |
128 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) | 128 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) |
129 | - | ||
130 | public Result<SysRole> edit(@RequestBody SysRole role) { | 129 | public Result<SysRole> edit(@RequestBody SysRole role) { |
131 | Result<SysRole> result = new Result<SysRole>(); | 130 | Result<SysRole> result = new Result<SysRole>(); |
132 | SysRole sysrole = sysRoleService.getById(role.getId()); | 131 | SysRole sysrole = sysRoleService.getById(role.getId()); |
@@ -150,7 +149,6 @@ public class SysRoleController { | @@ -150,7 +149,6 @@ public class SysRoleController { | ||
150 | * @return | 149 | * @return |
151 | */ | 150 | */ |
152 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) | 151 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) |
153 | - | ||
154 | public Result<SysRole> delete(@RequestParam(name="id",required=true) String id) { | 152 | public Result<SysRole> delete(@RequestParam(name="id",required=true) String id) { |
155 | Result<SysRole> result = new Result<SysRole>(); | 153 | Result<SysRole> result = new Result<SysRole>(); |
156 | SysRole sysrole = sysRoleService.getById(id); | 154 | SysRole sysrole = sysRoleService.getById(id); |
@@ -172,7 +170,6 @@ public class SysRoleController { | @@ -172,7 +170,6 @@ public class SysRoleController { | ||
172 | * @return | 170 | * @return |
173 | */ | 171 | */ |
174 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) | 172 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) |
175 | - | ||
176 | public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) { | 173 | public Result<SysRole> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
177 | Result<SysRole> result = new Result<SysRole>(); | 174 | Result<SysRole> result = new Result<SysRole>(); |
178 | if(ids==null || "".equals(ids.trim())) { | 175 | if(ids==null || "".equals(ids.trim())) { |
jeecg-boot/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -91,7 +91,6 @@ public class SysUserController { | @@ -91,7 +91,6 @@ public class SysUserController { | ||
91 | } | 91 | } |
92 | 92 | ||
93 | @RequestMapping(value = "/add", method = RequestMethod.POST) | 93 | @RequestMapping(value = "/add", method = RequestMethod.POST) |
94 | - | ||
95 | public Result<SysUser> add(@RequestBody JSONObject jsonObject) { | 94 | public Result<SysUser> add(@RequestBody JSONObject jsonObject) { |
96 | Result<SysUser> result = new Result<SysUser>(); | 95 | Result<SysUser> result = new Result<SysUser>(); |
97 | String selectedRoles = jsonObject.getString("selectedroles"); | 96 | String selectedRoles = jsonObject.getString("selectedroles"); |
@@ -115,7 +114,6 @@ public class SysUserController { | @@ -115,7 +114,6 @@ public class SysUserController { | ||
115 | } | 114 | } |
116 | 115 | ||
117 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) | 116 | @RequestMapping(value = "/edit", method = RequestMethod.PUT) |
118 | - | ||
119 | public Result<SysUser> edit(@RequestBody JSONObject jsonObject) { | 117 | public Result<SysUser> edit(@RequestBody JSONObject jsonObject) { |
120 | Result<SysUser> result = new Result<SysUser>(); | 118 | Result<SysUser> result = new Result<SysUser>(); |
121 | try { | 119 | try { |
@@ -140,7 +138,6 @@ public class SysUserController { | @@ -140,7 +138,6 @@ public class SysUserController { | ||
140 | } | 138 | } |
141 | 139 | ||
142 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) | 140 | @RequestMapping(value = "/delete", method = RequestMethod.DELETE) |
143 | - | ||
144 | public Result<SysUser> delete(@RequestParam(name="id",required=true) String id) { | 141 | public Result<SysUser> delete(@RequestParam(name="id",required=true) String id) { |
145 | Result<SysUser> result = new Result<SysUser>(); | 142 | Result<SysUser> result = new Result<SysUser>(); |
146 | // 定义SysUserDepart实体类的数据库查询LambdaQueryWrapper | 143 | // 定义SysUserDepart实体类的数据库查询LambdaQueryWrapper |
@@ -162,7 +159,6 @@ public class SysUserController { | @@ -162,7 +159,6 @@ public class SysUserController { | ||
162 | } | 159 | } |
163 | 160 | ||
164 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) | 161 | @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) |
165 | - | ||
166 | public Result<SysUser> deleteBatch(@RequestParam(name="ids",required=true) String ids) { | 162 | public Result<SysUser> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
167 | // 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper | 163 | // 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper |
168 | LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<SysUserDepart>(); | 164 | LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<SysUserDepart>(); |
@@ -292,7 +288,6 @@ public class SysUserController { | @@ -292,7 +288,6 @@ public class SysUserController { | ||
292 | * 修改密码 | 288 | * 修改密码 |
293 | */ | 289 | */ |
294 | @RequestMapping(value = "/changPassword", method = RequestMethod.PUT) | 290 | @RequestMapping(value = "/changPassword", method = RequestMethod.PUT) |
295 | - | ||
296 | public Result<SysUser> changPassword(@RequestBody SysUser sysUser) { | 291 | public Result<SysUser> changPassword(@RequestBody SysUser sysUser) { |
297 | Result<SysUser> result = new Result<SysUser>(); | 292 | Result<SysUser> result = new Result<SysUser>(); |
298 | String password = sysUser.getPassword(); | 293 | String password = sysUser.getPassword(); |