From 2e4242e37a295e28b0c2b96bb33b061f21334a3c Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 1 Nov 2025 03:39:26 +0800 Subject: [PATCH] =?UTF-8?q?refactor(user):=E9=87=8D=E6=9E=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=84-=20=E5=B0=86=20pageList=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=BB=8E=20Map=20?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20Response>=20-=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=20start/length=E4=B8=BA=20offset/pagesize=20-=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20PageModel=20=E5=B0=81=E8=A3=85=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=92=8C=E6=80=BB=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=95=B0=20-=20=E7=BB=9F=E4=B8=80=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=B8=BA=20Response=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=20ReturnT=20-=20=E5=89=8D=E7=AB=AF=20JS=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84=E5=88=86=E9=A1=B5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=20-=E4=BC=98=E5=8C=96=E7=A9=BA?= =?UTF-8?q?=E9=9B=86=E5=90=88=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=20isEmpt?= =?UTF-8?q?y()=20=E6=9B=BF=E4=BB=A3=20size()>0=20-=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E5=8E=9F=E6=9C=89=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E5=92=8C?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/biz/JobUserController.java | 66 +++++++++---------- .../main/resources/static/js/user.index.1.js | 14 +++- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java index 51fd36c2..ed101d29 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobUserController.java @@ -6,12 +6,12 @@ import com.xxl.job.admin.mapper.XxlJobUserMapper; import com.xxl.job.admin.model.XxlJobGroup; import com.xxl.job.admin.model.XxlJobUser; import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.core.openapi.model.ReturnT; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.sso.core.helper.XxlSsoHelper; import com.xxl.sso.core.model.LoginInfo; import com.xxl.tool.core.StringTool; import com.xxl.tool.encrypt.SHA256Tool; +import com.xxl.tool.response.PageModel; import com.xxl.tool.response.Response; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; @@ -51,50 +51,50 @@ public class JobUserController { @RequestMapping("/pageList") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public Map pageList(@RequestParam(value = "start", required = false, defaultValue = "0") int start, - @RequestParam(value = "length", required = false, defaultValue = "10") int length, - @RequestParam("username") String username, - @RequestParam("role") int role) { + public Response> pageList(@RequestParam(required = false, defaultValue = "0") int offset, + @RequestParam(required = false, defaultValue = "10") int pagesize, + @RequestParam String username, + @RequestParam int role) { // page list - List list = xxlJobUserMapper.pageList(start, length, username, role); - int list_count = xxlJobUserMapper.pageListCount(start, length, username, role); + List list = xxlJobUserMapper.pageList(offset, pagesize, username, role); + int list_count = xxlJobUserMapper.pageListCount(offset, pagesize, username, role); // filter - if (list!=null && list.size()>0) { + if (list!=null && !list.isEmpty()) { for (XxlJobUser item: list) { item.setPassword(null); } } // package result - Map maps = new HashMap(); - maps.put("recordsTotal", list_count); // 总记录数 - maps.put("recordsFiltered", list_count); // 过滤后的总记录数 - maps.put("data", list); // 分页列表 - return maps; + PageModel pageModel = new PageModel<>(); + pageModel.setPageData(list); + pageModel.setTotalCount(list_count); + + return Response.ofSuccess(pageModel); } @RequestMapping("/add") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public ReturnT add(XxlJobUser xxlJobUser) { + public Response add(XxlJobUser xxlJobUser) { // valid username if (StringTool.isBlank(xxlJobUser.getUsername())) { - return ReturnT.ofFail(I18nUtil.getString("system_please_input")+I18nUtil.getString("user_username") ); + return Response.ofFail(I18nUtil.getString("system_please_input")+I18nUtil.getString("user_username") ); } xxlJobUser.setUsername(xxlJobUser.getUsername().trim()); if (!(xxlJobUser.getUsername().length()>=4 && xxlJobUser.getUsername().length()<=20)) { - return ReturnT.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); } // valid password if (StringTool.isBlank(xxlJobUser.getPassword())) { - return ReturnT.ofFail(I18nUtil.getString("system_please_input")+I18nUtil.getString("user_password") ); + return Response.ofFail(I18nUtil.getString("system_please_input")+I18nUtil.getString("user_password") ); } xxlJobUser.setPassword(xxlJobUser.getPassword().trim()); if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) { - return ReturnT.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); } // md5 password String passwordHash = SHA256Tool.sha256(xxlJobUser.getPassword()); @@ -103,30 +103,30 @@ public class JobUserController { // check repeat XxlJobUser existUser = xxlJobUserMapper.loadByUserName(xxlJobUser.getUsername()); if (existUser != null) { - return ReturnT.ofFail( I18nUtil.getString("user_username_repeat") ); + return Response.ofFail( I18nUtil.getString("user_username_repeat") ); } // write xxlJobUserMapper.save(xxlJobUser); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @RequestMapping("/update") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public ReturnT update(HttpServletRequest request, XxlJobUser xxlJobUser) { + public Response update(HttpServletRequest request, XxlJobUser xxlJobUser) { // avoid opt login seft Response loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); if (loginInfoResponse.getData().getUserName().equals(xxlJobUser.getUsername())) { - return ReturnT.ofFail(I18nUtil.getString("user_update_loginuser_limit")); + return Response.ofFail(I18nUtil.getString("user_update_loginuser_limit")); } // valid password if (StringTool.isNotBlank(xxlJobUser.getPassword())) { xxlJobUser.setPassword(xxlJobUser.getPassword().trim()); if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) { - return ReturnT.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); } // md5 password String passwordHash = SHA256Tool.sha256(xxlJobUser.getPassword()); @@ -137,40 +137,40 @@ public class JobUserController { // write xxlJobUserMapper.update(xxlJobUser); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @RequestMapping("/remove") @ResponseBody @XxlSso(role = Consts.ADMIN_ROLE) - public ReturnT remove(HttpServletRequest request, @RequestParam("id") int id) { + public Response remove(HttpServletRequest request, @RequestParam("id") int id) { // avoid opt login seft Response loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); if (Integer.parseInt(loginInfoResponse.getData().getUserId()) == id) { - return ReturnT.ofFail(I18nUtil.getString("user_update_loginuser_limit")); + return Response.ofFail(I18nUtil.getString("user_update_loginuser_limit")); } xxlJobUserMapper.delete(id); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } @RequestMapping("/updatePwd") @ResponseBody - public ReturnT updatePwd(HttpServletRequest request, + public Response updatePwd(HttpServletRequest request, @RequestParam("password") String password, @RequestParam("oldPassword") String oldPassword){ // valid if (oldPassword==null || oldPassword.trim().isEmpty()){ - return ReturnT.ofFail(I18nUtil.getString("system_please_input") + I18nUtil.getString("change_pwd_field_oldpwd")); + return Response.ofFail(I18nUtil.getString("system_please_input") + I18nUtil.getString("change_pwd_field_oldpwd")); } if (password==null || password.trim().isEmpty()){ - return ReturnT.ofFail(I18nUtil.getString("system_please_input") + I18nUtil.getString("change_pwd_field_oldpwd")); + return Response.ofFail(I18nUtil.getString("system_please_input") + I18nUtil.getString("change_pwd_field_oldpwd")); } password = password.trim(); if (!(password.length()>=4 && password.length()<=20)) { - return ReturnT.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); + return Response.ofFail(I18nUtil.getString("system_lengh_limit")+"[4-20]" ); } // md5 password @@ -181,14 +181,14 @@ public class JobUserController { Response loginInfoResponse = XxlSsoHelper.loginCheckWithAttr(request); XxlJobUser existUser = xxlJobUserMapper.loadByUserName(loginInfoResponse.getData().getUserName()); if (!oldPasswordHash.equals(existUser.getPassword())) { - return ReturnT.ofFail(I18nUtil.getString("change_pwd_field_oldpwd") + I18nUtil.getString("system_unvalid")); + return Response.ofFail(I18nUtil.getString("change_pwd_field_oldpwd") + I18nUtil.getString("system_unvalid")); } // write new existUser.setPassword(passwordHash); xxlJobUserMapper.update(existUser); - return ReturnT.ofSuccess(); + return Response.ofSuccess(); } } diff --git a/xxl-job-admin/src/main/resources/static/js/user.index.1.js b/xxl-job-admin/src/main/resources/static/js/user.index.1.js index 48d3f302..49851dd4 100644 --- a/xxl-job-admin/src/main/resources/static/js/user.index.1.js +++ b/xxl-job-admin/src/main/resources/static/js/user.index.1.js @@ -10,12 +10,20 @@ $(function() { type:"post", data : function ( d ) { var obj = {}; + obj.offset = d.start; + obj.pagesize = d.length; obj.username = $('#username').val(); obj.role = $('#role').val(); - obj.start = d.start; - obj.length = d.length; return obj; - } + }, + dataFilter: function (json ) { + var result = JSON.parse(json); + return JSON.stringify({ + "recordsTotal": result.data.totalCount, + "recordsFiltered": result.data.totalCount, + "data": result.data.pageData + }); + } }, "searching": false, "ordering": false,