From 4d3f0a565404bcf25fd26a66179a7613b1abae9e Mon Sep 17 00:00:00 2001 From: weiyi_si Date: Tue, 5 Sep 2023 22:31:47 +0800 Subject: [PATCH] =?UTF-8?q?sys=E9=A1=B9=E7=9B=AE=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/len/base/BaseService.java | 6 +-- .../com/len/controller/JobController.java | 33 ++++++++----- .../com/len/controller/MenuController.java | 30 ++++++++---- .../com/len/controller/PersonController.java | 12 +++-- .../com/len/controller/UserController.java | 46 +++++++++++++------ .../main/java/com/len/service/JobService.java | 16 +++---- .../java/com/len/service/MenuService.java | 2 +- .../service/impl/DashboardServiceImpl.java | 8 +++- .../com/len/service/impl/MenuServiceImpl.java | 5 +- .../resources/i18n/message_en_US.properties | 3 ++ .../resources/i18n/message_zh_CN.properties | 3 ++ 11 files changed, 108 insertions(+), 56 deletions(-) diff --git a/len-core/src/main/java/com/len/base/BaseService.java b/len-core/src/main/java/com/len/base/BaseService.java index 863404d..6e387a4 100644 --- a/len-core/src/main/java/com/len/base/BaseService.java +++ b/len-core/src/main/java/com/len/base/BaseService.java @@ -10,9 +10,9 @@ import com.len.util.ReType; */ public interface BaseService extends IService { - public ReType show(T t, int page, int limit); + ReType show(T t, int page, int limit); - public ReType getList(T t, int page, int limit); + ReType getList(T t, int page, int limit); - public List showAll(T t); + List showAll(T t); } diff --git a/len-sys/src/main/java/com/len/controller/JobController.java b/len-sys/src/main/java/com/len/controller/JobController.java index 70ebfd3..2c29d26 100644 --- a/len-sys/src/main/java/com/len/controller/JobController.java +++ b/len-sys/src/main/java/com/len/controller/JobController.java @@ -42,7 +42,7 @@ public class JobController extends BaseController { /** * 跳转到 任务列表 - * + * * @return path */ @GetMapping(value = "showJob") @@ -53,9 +53,9 @@ public class JobController extends BaseController { /** * 任务列表 - * - * @param job 条件 - * @param page page + * + * @param job 条件 + * @param page page * @param limit limit * @return job list */ @@ -77,8 +77,12 @@ public class JobController extends BaseController { @ResponseBody public LenResponse addJob(SysJob job) { job.setStatus(false); - jobService.save(job); - return succ(MsHelper.getMsg("insert.success")); + boolean isSuccess = jobService.save(job); + if (isSuccess) { + return succ(MsHelper.getMsg("insert.success")); + } else { + return error(MsHelper.getMsg("insert.fail")); + } } @GetMapping(value = "updateJob") @@ -99,9 +103,12 @@ public class JobController extends BaseController { if (jobTask.checkJob(job)) { throw new ServiceException(MsHelper.getMsg("job.started")); } - jobService.updateJob(job); - return succ(MsHelper.getMsg("update.success")); - + boolean isSuccess = jobService.updateJob(job); + if (isSuccess) { + return succ(MsHelper.getMsg("update.success")); + } else { + return error(MsHelper.getMsg("update.fail")); + } } @Log(desc = "删除任务", type = LOG_TYPE.DEL) @@ -110,8 +117,12 @@ public class JobController extends BaseController { @ResponseBody @RequiresPermissions("job:del") public LenResponse del(String id) { - jobService.del(id); - return succ(MsHelper.getMsg("del.success")); + boolean isSuccess = jobService.del(id); + if (isSuccess) { + return succ(MsHelper.getMsg("del.success")); + } else { + return error(MsHelper.getMsg("del.fail")); + } } @Log(desc = "启动任务") diff --git a/len-sys/src/main/java/com/len/controller/MenuController.java b/len-sys/src/main/java/com/len/controller/MenuController.java index 498a885..4153bbf 100644 --- a/len-sys/src/main/java/com/len/controller/MenuController.java +++ b/len-sys/src/main/java/com/len/controller/MenuController.java @@ -64,13 +64,17 @@ public class MenuController extends BaseController { @PostMapping(value = "addMenu") @ResponseBody public LenResponse addMenu(SysMenu sysMenu) { - menuService.addMenu(sysMenu); - return succ(MsHelper.getMsg("insert.success")); + Boolean isSuccess = menuService.addMenu(sysMenu); + if (isSuccess) { + return succ(MsHelper.getMsg("insert.success")); + } else { + return error(MsHelper.getMsg("insert.fail")); + } } /** * 显示更新菜单信息 - * + * * @param model * @param id * @return @@ -90,7 +94,7 @@ public class MenuController extends BaseController { /** * 更新菜单 - * + * * @param sysMenu * @return */ @@ -100,13 +104,17 @@ public class MenuController extends BaseController { public LenResponse updateMenu(SysMenu sysMenu) { SysMenu oldMenu = menuService.getById(sysMenu.getId()); BeanUtil.copyNotNullBean(sysMenu, oldMenu); - menuService.updateById(oldMenu); - return succ(MsHelper.getMsg("update.success")); + boolean isSuccess = menuService.updateById(oldMenu); + if (isSuccess) { + return succ(MsHelper.getMsg("update.success")); + } else { + return error(MsHelper.getMsg("update.failed")); + } } /** * 删除菜单 - * + * * @param id 菜单id * @return */ @@ -114,8 +122,12 @@ public class MenuController extends BaseController { @PostMapping("del") @ResponseBody public LenResponse del(String id) { - menuService.del(id); - return succ(MsHelper.getMsg("del.success")); + boolean isSuccess = menuService.del(id); + if (isSuccess) { + return succ(MsHelper.getMsg("del.success")); + } else { + return error(MsHelper.getMsg("update.failed")); + } } } diff --git a/len-sys/src/main/java/com/len/controller/PersonController.java b/len-sys/src/main/java/com/len/controller/PersonController.java index 3913a26..20f726d 100644 --- a/len-sys/src/main/java/com/len/controller/PersonController.java +++ b/len-sys/src/main/java/com/len/controller/PersonController.java @@ -35,7 +35,7 @@ public class PersonController extends BaseController { /** * 跳转到个人资料 - * + * * @param model * @return */ @@ -53,7 +53,7 @@ public class PersonController extends BaseController { /** * 更新个人资料 - * + * * @param user 用户信息 * @return success */ @@ -62,7 +62,11 @@ public class PersonController extends BaseController { @PostMapping(value = "updateUser") @ResponseBody public LenResponse updatePerson(SysUser user) { - userService.updatePerson(user); - return succ(MsHelper.getMsg("update.success")); + boolean isSuccess = userService.updatePerson(user); + if (isSuccess) { + return succ(MsHelper.getMsg("update.success")); + } else { + return error(MsHelper.getMsg("update.fail")); + } } } diff --git a/len-sys/src/main/java/com/len/controller/UserController.java b/len-sys/src/main/java/com/len/controller/UserController.java index b538a5a..c83a6a4 100644 --- a/len-sys/src/main/java/com/len/controller/UserController.java +++ b/len-sys/src/main/java/com/len/controller/UserController.java @@ -68,9 +68,9 @@ public class UserController extends BaseController { /** * 用户列表 - * - * @param user 条件 - * @param page page + * + * @param user 条件 + * @param page page * @param limit limit * @return user list */ @@ -84,10 +84,10 @@ public class UserController extends BaseController { /** * 审批流定义 根据角色展示用户信息 - * + * * @param roleId 角色id - * @param page 当前页 - * @param limit 数量 + * @param page 当前页 + * @param limit 数量 * @return role user */ @ApiOperation(value = "/listByRoleId", httpMethod = "GET", notes = "展示角色") @@ -105,7 +105,7 @@ public class UserController extends BaseController { /** * 跳转到添加用户界面 - * + * * @param model * @return add user path */ @@ -125,8 +125,12 @@ public class UserController extends BaseController { if (role == null) { return error(MsHelper.getMsg("user.select.role")); } - userService.add(user, Arrays.asList(role)); - return succ(); + boolean isSuccess = userService.add(user, Arrays.asList(role)); + if (isSuccess) { + return succ(MsHelper.getMsg("insert.success")); + } else { + return error(MsHelper.getMsg("insert.fail")); + } } @GetMapping(value = "updateUser") @@ -155,8 +159,12 @@ public class UserController extends BaseController { if (role != null) { roles = Arrays.asList(role); } - userService.updateUser(user, roles); - return succ(MsHelper.getMsg("update.success")); + boolean isSuccess = userService.updateUser(user, roles); + if (isSuccess) { + return succ(MsHelper.getMsg("update.success")); + } else { + return error(MsHelper.getMsg("update.fail")); + } } @Log(desc = "删除用户", type = LOG_TYPE.DEL) @@ -165,8 +173,12 @@ public class UserController extends BaseController { @ResponseBody @RequiresPermissions("user:del") public LenResponse del(String id, boolean realDel) { - userService.delById(id, realDel); - return succ(MsHelper.getMsg("del.success")); + boolean isSuccess = userService.delById(id, realDel); + if (isSuccess) { + return succ(MsHelper.getMsg("del.success")); + } else { + return error(MsHelper.getMsg("del.fail")); + } } @GetMapping(value = "goRePass") @@ -188,8 +200,12 @@ public class UserController extends BaseController { @ResponseBody @RequiresPermissions("user:repass") public LenResponse rePass(String userId, String newPwd) { - userService.rePass(userId, newPwd); - return succ(MsHelper.getMsg("update.success")); + int count = userService.rePass(userId, newPwd); + if (count > 0) { + return succ(MsHelper.getMsg("update.success")); + } else { + return error(MsHelper.getMsg("update.fail")); + } } /** diff --git a/len-sys/src/main/java/com/len/service/JobService.java b/len-sys/src/main/java/com/len/service/JobService.java index 9c7fa4f..bb7ce7a 100644 --- a/len-sys/src/main/java/com/len/service/JobService.java +++ b/len-sys/src/main/java/com/len/service/JobService.java @@ -7,34 +7,34 @@ public interface JobService extends BaseService { /** * 更新 - * + * * @param job * @return */ - public boolean updateJob(SysJob job); + boolean updateJob(SysJob job); /** * 删除 - * + * * @param id * @return */ - public boolean del(String id); + boolean del(String id); /** * 启动任务 - * + * * @param id * @return */ - public boolean startJob(String id); + boolean startJob(String id); /** * 停止任务 - * + * * @param id * @return */ - public boolean stopJob(String id); + boolean stopJob(String id); } diff --git a/len-sys/src/main/java/com/len/service/MenuService.java b/len-sys/src/main/java/com/len/service/MenuService.java index 1147974..19f77bd 100644 --- a/len-sys/src/main/java/com/len/service/MenuService.java +++ b/len-sys/src/main/java/com/len/service/MenuService.java @@ -14,7 +14,7 @@ public interface MenuService extends BaseService { * @param menu * @return */ - String addMenu(SysMenu menu); + Boolean addMenu(SysMenu menu); List getMenuNotSuper(); diff --git a/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java index fd2e5f9..3421ec5 100644 --- a/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java +++ b/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java @@ -35,7 +35,7 @@ public class DashboardServiceImpl implements DashboardService { } sysPanelOpts.sort(Comparator.comparing(SysPanelOpt::getPaneloptIndex)); return sysPanelOpts.stream().sorted(Comparator.comparingInt(SysPanelOpt::getPaneloptColumn)) - .collect(Collectors.groupingBy(SysPanelOpt::getPaneloptColumn)); + .collect(Collectors.groupingBy(SysPanelOpt::getPaneloptColumn)); } /** @@ -79,7 +79,11 @@ public class DashboardServiceImpl implements DashboardService { String userId = Principal.getPrincipal().getId(); for (SysPanelOpt panelOpt : sysPanelOpts) { panelOpt.setPaneloptUserid(userId); - panelOptMapper.updateById(panelOpt); + try { + panelOptMapper.updateById(panelOpt); + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java index 1654055..a30116a 100644 --- a/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java +++ b/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java @@ -68,7 +68,7 @@ public class MenuServiceImpl extends BaseServiceImpl imp } @Override - public String addMenu(SysMenu sysMenu) { + public Boolean addMenu(SysMenu sysMenu) { if (StringUtils.isEmpty(sysMenu.getPId())) { sysMenu.setPId(null); } @@ -82,8 +82,7 @@ public class MenuServiceImpl extends BaseServiceImpl imp sysMenu.setMenuType((byte)0); } sysMenu.setCode(randomCode()); - save(sysMenu); - return ""; + return save(sysMenu); } @Override diff --git a/len-sys/src/main/resources/i18n/message_en_US.properties b/len-sys/src/main/resources/i18n/message_en_US.properties index e4931c6..5671621 100644 --- a/len-sys/src/main/resources/i18n/message_en_US.properties +++ b/len-sys/src/main/resources/i18n/message_en_US.properties @@ -2,8 +2,11 @@ success=success fail=failed error=error update.success=update success +update.fail=update failed insert.success=New successfully +insert.fail=New failed del.success=Successfully deleted +del.fail=Failed deleted #\u7528\u6237\u4E1A\u52A1 user.exists=The user name already exists user.del.admin=Super tube cannot be deleted diff --git a/len-sys/src/main/resources/i18n/message_zh_CN.properties b/len-sys/src/main/resources/i18n/message_zh_CN.properties index 53e0345..f822307 100644 --- a/len-sys/src/main/resources/i18n/message_zh_CN.properties +++ b/len-sys/src/main/resources/i18n/message_zh_CN.properties @@ -2,8 +2,11 @@ success=\u6210\u529F fail=\u5931\u8D25 error=\u9519\u8BEF update.success=\u4FEE\u6539\u6210\u529F +update.fail=\u4FEE\u6539\u5931\u8D25 insert.success=\u65B0\u5EFA\u6210\u529F +insert.fail=\u65B0\u5EFA\u5931\u8D25 del.success=\u5220\u9664\u6210\u529F +del.fail=\u5220\u9664\u5931\u8D25 #\u7528\u6237\u4E1A\u52A1 user.exists=\u7528\u6237\u540D\u5DF2\u5B58\u5728 user.del.admin=\u8D85\u7BA1\u65E0\u6CD5\u5220\u9664 -- Gitee