From d5c97fbd5ca78c2055b781bd1866dc3e3267cdf8 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 16 Apr 2022 22:49:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E5=A4=84=E7=90=86Result=EF=BC=8C=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=B7=B2=E6=94=BE=E5=BC=83=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89success=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BAOK?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E7=9A=84?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/api/vo/Result.java | 61 +++----- .../jero/common/constant/CommonConstant.java | 6 + .../jero/common/util/SqlInjectionUtil.java | 1 - .../generate/pojo/onetomany/SubTableVo.java | 2 - .../controller/OnlCgformAuthController.java | 55 +++---- .../controller/OnlCgformButtonController.java | 104 ++++++-------- .../controller/OnlCgformFieldController.java | 48 +++---- .../controller/OnlCgformHeadController.java | 94 ++++++------ .../controller/OnlCgformIndexController.java | 107 ++++++-------- .../controller/OnlCgreportHeadController.java | 36 +++-- .../modules/demo/mock/MockController.java | 2 +- .../test/controller/JoaDemoController.java | 45 +++--- .../cas/controller/CasClientController.java | 6 +- .../SysMessageTemplateController.java | 11 +- .../controller/ActuatorRedisController.java | 4 +- .../oss/controller/OSSFileController.java | 16 +-- .../controller/QuartzJobController.java | 5 +- .../controller/DuplicateCheckController.java | 2 +- .../controller/SysAnnouncementController.java | 107 ++++++++------ .../SysAnnouncementSendController.java | 50 +++---- .../controller/SysCategoryController.java | 54 +++---- .../controller/SysDepartController.java | 84 +++-------- .../SysDepartPermissionController.java | 8 +- .../system/controller/SysDictController.java | 38 ++--- .../controller/SysDictItemController.java | 35 ++--- .../system/controller/SysLogController.java | 22 ++- .../controller/SysPermissionController.java | 77 ++++------ .../system/controller/SysRoleController.java | 44 +++--- .../controller/SysTenantController.java | 43 +++--- .../controller/SysUserAgentController.java | 52 +++---- .../system/controller/SysUserController.java | 90 +++++------- .../controller/SysUserOnlineController.java | 2 +- .../system/service/impl/LoginServiceImpl.java | 4 +- .../com/jero/JeroSystemSingleApplication.java | 6 +- .../templates/announcement/showContent.ftl | 135 ++++++++++++++++++ .../components/cells/JVxeSelectCell.vue | 1 - jero-web/src/store/modules/user.js | 6 +- jero-web/src/views/user/Login.vue | 2 +- 38 files changed, 664 insertions(+), 801 deletions(-) create mode 100644 jero-boot/jero-boot-single-startup/src/main/resources/templates/announcement/showContent.ftl diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java index 9355f227..1336e08e 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java @@ -35,7 +35,7 @@ public class Result implements Serializable { * 返回代码 */ @ApiModelProperty(value = "返回代码") - private Integer code = 0; + private Integer code = 200; /** * 返回数据对象 data @@ -52,40 +52,6 @@ public class Result implements Serializable { public Result() { } - - public Result success(String message) { - this.message = message; - this.code = CommonConstant.SC_OK_200; - this.success = true; - return this; - } - - @Deprecated - public static Result ok() { - Result r = new Result(); - r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); - r.setMessage("成功"); - return r; - } - - @Deprecated - public static Result ok(String msg) { - Result r = new Result(); - r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); - r.setMessage(msg); - return r; - } - - @Deprecated - public static Result ok(Object data) { - Result r = new Result(); - r.setSuccess(true); - r.setCode(CommonConstant.SC_OK_200); - r.setResult(data); - return r; - } public static Result OK() { Result r = new Result(); @@ -95,6 +61,14 @@ public class Result implements Serializable { return r; } + public static Result OK(String message) { + Result r = new Result(); + r.setSuccess(true); + r.setCode(CommonConstant.SC_OK_200); + r.setMessage(message); + return r; + } + public static Result OK(T data) { Result r = new Result(); r.setSuccess(true); @@ -121,23 +95,24 @@ public class Result implements Serializable { return r; } - public static Result error(String msg) { + public static Result error(String msg) { return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg); } - public static Result error(int code, String msg) { - Result r = new Result(); + public static Result error(int code, String msg) { + Result r = new Result(); r.setCode(code); r.setMessage(msg); r.setSuccess(false); return r; } - public Result error500(String message) { - this.message = message; - this.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; - this.success = false; - return this; + public static Result error500(String message) { + Result r = new Result(); + r.message = message; + r.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500; + r.success = false; + return r; } /** * 无权限访问返回结果 diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java index 4843191d..bac966c7 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java @@ -309,4 +309,10 @@ public interface CommonConstant { * 第三方登录 验证密码/创建用户 都需要设置一个操作码 防止被恶意调用 */ public final static String THIRD_LOGIN_CODE = "third_login_code"; + + public final static String ANNOUNCEMENT_SEND_STATUS_0 = "0"; + /** 系统通告消息状态：1=已发布 */ + public final static String ANNOUNCEMENT_SEND_STATUS_1 = "1"; + /** 系统通告消息状态：2=已撤销 */ + public final static String ANNOUNCEMENT_SEND_STATUS_2 = "2"; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SqlInjectionUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SqlInjectionUtil.java index e2d1ef84..14fc7da6 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SqlInjectionUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/SqlInjectionUtil.java @@ -133,7 +133,6 @@ public class SqlInjectionUtil { * @param value * @return */ - @Deprecated public static void specialFilterContentForOnlineReport(String value) { String specialXssStr = " exec | insert | delete | update | drop | chr | mid | master | truncate | char | declare |"; String[] xssArr = specialXssStr.split("\\|"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/onetomany/SubTableVo.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/onetomany/SubTableVo.java index 8d9f74b8..b4c05cad 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/onetomany/SubTableVo.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/pojo/onetomany/SubTableVo.java @@ -124,8 +124,6 @@ public class SubTableVo { return this.originalForeignKeys; } - /** @deprecated */ - @Deprecated public void setOriginalForeignKeys(String[] originalForeignKeys) { this.originalForeignKeys = originalForeignKeys; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java index 98a0a595..9cced1dc 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java @@ -76,21 +76,19 @@ public class OnlCgformAuthController { @PostMapping({"/authData"}) - public Result a(@RequestBody OnlAuthData paramOnlAuthData) { - Result result = new Result(); + public Result addAuthData(@RequestBody OnlAuthData paramOnlAuthData) { try { this.onlAuthDataService.save(paramOnlAuthData); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } @PutMapping({"/authData"}) - public Result b(@RequestBody OnlAuthData paramOnlAuthData) { + public Result editAuthData(@RequestBody OnlAuthData paramOnlAuthData) { Result result = new Result(); this.onlAuthDataService.updateById(paramOnlAuthData); return result; @@ -98,14 +96,14 @@ public class OnlCgformAuthController { @DeleteMapping({"/authData/{id}"}) - public Result b(@PathVariable("id") String paramString) { + public Result getAuthDataById(@PathVariable("id") String paramString) { this.onlAuthDataService.deleteOne(paramString); return Result.OK("删除成功!"); } @GetMapping({"/authButton/{cgformId}"}) - public Result> c(@PathVariable("cgformId") String paramString) { + public Result> getAuthButton(@PathVariable("cgformId") String paramString) { Result> result = new Result(); LambdaQueryWrapper buttonLambdaQueryWrapper = new LambdaQueryWrapper(); @@ -129,8 +127,7 @@ public class OnlCgformAuthController { @PostMapping({"/authButton"}) - public Result a(@RequestBody OnlAuthPage paramOnlAuthPage) { - Result result = new Result(); + public Result addAuthButton(@RequestBody OnlAuthPage paramOnlAuthPage) { try { String str = paramOnlAuthPage.getId(); boolean bool = false; @@ -146,13 +143,11 @@ public class OnlCgformAuthController { paramOnlAuthPage.setStatus(Integer.valueOf(1)); this.onlAuthPageService.save(paramOnlAuthPage); } - result.setResult(paramOnlAuthPage); - result.success("操作成功！"); + return Result.OK("操作成功！", paramOnlAuthPage); } catch (Exception exception) { log.error(exception.getMessage(), exception); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } @@ -219,41 +214,35 @@ public class OnlCgformAuthController { @PutMapping({"/authColumn"}) - public Result a(@RequestBody AuthColumnVO paramAuthColumnVO) { - Result result = new Result(); + public Result editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { try { if (paramAuthColumnVO.getStatus().intValue() == 1) { - this.onlAuthPageService.enableAuthColumn(paramAuthColumnVO); } else { - this.onlAuthPageService.disableAuthColumn(paramAuthColumnVO); } - result.success("操作成功！"); + return Result.OK("操作成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } @PostMapping({"/authColumn"}) - public Result b(@RequestBody AuthColumnVO paramAuthColumnVO) { - Result result = new Result(); + public Result addAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { try { this.onlAuthPageService.switchAuthColumn(paramAuthColumnVO); - result.success("操作成功！"); + return Result.OK("操作成功！"); } catch (Exception exception) { log.error(exception.getMessage(), exception); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } @GetMapping({"/authPage/{cgformId}/{type}"}) - public Result> a(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) { + public Result> getAuthPage(@PathVariable("cgformId") String paramString, @PathVariable("type") Integer paramInteger) { Result> result = new Result(); List list = this.onlAuthPageService.queryAuthByFormId(paramString, paramInteger.intValue()); result.setResult(list); @@ -263,7 +252,7 @@ public class OnlCgformAuthController { @GetMapping({"/validAuthData/{cgformId}"}) - public Result> f(@PathVariable("cgformId") String paramString) { + public Result> validAuthData(@PathVariable("cgformId") String paramString) { Result> result = new Result(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); @@ -279,7 +268,7 @@ public class OnlCgformAuthController { @GetMapping({"/roleAuth"}) - public Result> a(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) { + public Result> getRoleAuth(@RequestParam("roleId") String paramString1, @RequestParam("cgformId") String paramString2, @RequestParam("type") Integer paramInteger) { Result> result = new Result(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); @@ -296,7 +285,7 @@ public class OnlCgformAuthController { @PostMapping({"/roleColumnAuth/{roleId}/{cgformId}"}) - public Result a(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { + public Result addRoleColumnAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { Result result = new Result(); JSONArray jSONArray = paramJSONObject.getJSONArray("authId"); List list = jSONArray.toJavaList(String.class); @@ -307,7 +296,7 @@ public class OnlCgformAuthController { @PostMapping({"/roleButtonAuth/{roleId}/{cgformId}"}) - public Result b(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { + public Result addrRleButtonAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { Result result = new Result(); JSONArray jSONArray = paramJSONObject.getJSONArray("authId"); List list = jSONArray.toJavaList(String.class); @@ -318,7 +307,7 @@ public class OnlCgformAuthController { @PostMapping({"/roleDataAuth/{roleId}/{cgformId}"}) - public Result c(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { + public Result addRoleDataAuth(@PathVariable("roleId") String paramString1, @PathVariable("cgformId") String paramString2, @RequestBody JSONObject paramJSONObject) { Result result = new Result(); JSONArray jSONArray = paramJSONObject.getJSONArray("authId"); List list = jSONArray.toJavaList(String.class); @@ -329,7 +318,7 @@ public class OnlCgformAuthController { @GetMapping({"/getAuthColumn/{desformCode}"}) - public Result> g(@PathVariable("desformCode") String paramString) { + public Result> getAuthColumn(@PathVariable("desformCode") String paramString) { LambdaQueryWrapper cgformHeadLambdaQueryWrapper = new LambdaQueryWrapper(); cgformHeadLambdaQueryWrapper.eq(OnlCgformHead::getTableName, paramString); OnlCgformHead onlCgformHead = (OnlCgformHead) this.onlCgformHeadService.getOne((Wrapper) (cgformHeadLambdaQueryWrapper)); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java index dfe3f302..b3222a92 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java @@ -36,7 +36,7 @@ public class OnlCgformButtonController { } @GetMapping({"/list/{code}"}) - public Result> a(OnlCgformButton var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4, @PathVariable("code") String var5) { + public Result> list(OnlCgformButton var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4, @PathVariable("code") String var5) { Result var6 = new Result(); var1.setCgformHeadId(var5); QueryWrapper var7 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); @@ -48,96 +48,78 @@ public class OnlCgformButtonController { } @PostMapping({"/add"}) - public Result a(@RequestBody OnlCgformButton var1) { - Result var2 = new Result(); - - try { - this.onlCgformButtonService.save(var1); - var2.success("添加成功！"); - } catch (Exception var4) { - log.error(var4.getMessage(), var4); - var2.error500("操作失败"); + public Result add(@RequestBody OnlCgformButton cgformButton) { + try { + this.onlCgformButtonService.save(cgformButton); + return Result.OK("添加成功！"); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error500("操作失败"); } - - return var2; } @PostMapping({"/aitest"}) - public Result a(@RequestBody JSONArray var1) { - Result var2 = new Result(); - + public Result aitest(@RequestBody JSONArray jsonArray) { try { - for(int var3 = 0; var3 < var1.size(); ++var3) { - JSONObject var4 = var1.getJSONObject(var3); - OnlCgformButton var5 = (OnlCgformButton)JSONObject.parseObject(var4.toJSONString(), OnlCgformButton.class); - this.onlCgformButtonService.saveButton(var5); + for(int i = 0; i < jsonArray.size(); ++i) { + JSONObject jsonObject = jsonArray.getJSONObject(i); + OnlCgformButton cgformButton = (OnlCgformButton)JSONObject.parseObject(jsonObject.toJSONString(), OnlCgformButton.class); + this.onlCgformButtonService.saveButton(cgformButton); } - - var2.success("添加成功！"); - } catch (Exception var6) { - log.error(var6.getMessage(), var6); - var2.error500("操作失败"); + return Result.OK("添加成功！"); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error500("操作失败"); } - - return var2; } @PutMapping({"/edit"}) - public Result b(@RequestBody OnlCgformButton var1) { - Result var2 = new Result(); - OnlCgformButton var3 = (OnlCgformButton)this.onlCgformButtonService.getById(var1.getId()); - if (var3 == null) { - var2.error500("未找到对应实体"); + public Result edit(@RequestBody OnlCgformButton cgformButton) { + OnlCgformButton existCgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(cgformButton.getId()); + if (existCgformButton == null) { + return Result.error500("未找到对应实体"); } else { - boolean var4 = this.onlCgformButtonService.updateById(var1); - if (var4) { - var2.success("修改成功!"); + boolean flag = this.onlCgformButtonService.updateById(cgformButton); + if (flag) { + return Result.OK("修改成功!"); } } - return var2; + return Result.OK(); } @DeleteMapping({"/delete"}) - public Result a(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); - OnlCgformButton var3 = (OnlCgformButton)this.onlCgformButtonService.getById(var1); - if (var3 == null) { - var2.error500("未找到对应实体"); + public Result delete(@RequestParam(name = "id",required = true) String id) { + OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id); + if (cgformButton == null) { + return Result.error500("未找到对应实体"); } else { - boolean var4 = this.onlCgformButtonService.removeById(var1); - if (var4) { - var2.success("删除成功!"); + boolean flag = this.onlCgformButtonService.removeById(id); + if (flag) { + return Result.OK("删除成功!"); } } - return var2; + return Result.OK(); } @DeleteMapping({"/deleteBatch"}) - public Result b(@RequestParam(name = "ids",required = true) String var1) { - Result var2 = new Result(); - if (var1 != null && !"".equals(var1.trim())) { - this.onlCgformButtonService.removeByIds(Arrays.asList(var1.split(","))); - var2.success("删除成功!"); + public Result deleteBatch(@RequestParam(name = "ids",required = true) String ids) { + if (ids != null && !"".equals(ids.trim())) { + this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("删除成功!"); } else { - var2.error500("参数不识别！"); + return Result.error500("参数不识别！"); } - - return var2; } @GetMapping({"/queryById"}) - public Result c(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); - OnlCgformButton var3 = (OnlCgformButton)this.onlCgformButtonService.getById(var1); - if (var3 == null) { - var2.error500("未找到对应实体"); + public Result queryById(@RequestParam(name = "id",required = true) String id) { + OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id); + if (cgformButton == null) { + return Result.error500("未找到对应实体"); } else { - var2.setResult(var3); - var2.setSuccess(true); + return Result.OK(cgformButton); } - - return var2; } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java index 679bb09e..01fa57a8 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java @@ -66,76 +66,62 @@ public class OnlCgformFieldController { } @PostMapping({"/add"}) - public Result a(@RequestBody OnlCgformField var1) { - Result var2 = new Result(); - + public Result add(@RequestBody OnlCgformField var1) { try { this.onlCgformFieldService.save(var1); - var2.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception var4) { log.error(var4.getMessage(), var4); - var2.error500("操作失败"); + return Result.error500("操作失败"); } - - return var2; } @PutMapping({"/edit"}) - public Result b(@RequestBody OnlCgformField var1) { - Result var2 = new Result(); + public Result edit(@RequestBody OnlCgformField var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1.getId()); if (var3 == null) { - var2.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); } else { boolean var4 = this.onlCgformFieldService.updateById(var1); if (var4) { - var2.success("修改成功!"); + return Result.OK("修改成功!"); } } - - return var2; + return Result.OK(); } @DeleteMapping({"/delete"}) - public Result c(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); + public Result delete(@RequestParam(name = "id",required = true) String var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1); if (var3 == null) { - var2.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); } else { boolean var4 = this.onlCgformFieldService.removeById(var1); if (var4) { - var2.success("删除成功!"); + return Result.OK("删除成功!"); } } - return var2; + return Result.OK(); } @DeleteMapping({"/deleteBatch"}) - public Result d(@RequestParam(name = "ids",required = true) String var1) { - Result var2 = new Result(); + public Result deleteBatch(@RequestParam(name = "ids",required = true) String var1) { if (var1 != null && !"".equals(var1.trim())) { this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(","))); - var2.success("删除成功!"); + return Result.OK("删除成功!"); } else { - var2.error500("参数不识别！"); + return Result.error500("参数不识别！"); } - - return var2; } @GetMapping({"/queryById"}) - public Result e(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); + public Result queryById(@RequestParam(name = "id",required = true) String var1) { OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1); if (var3 == null) { - var2.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); } else { - var2.setResult(var3); - var2.setSuccess(true); + return Result.OK(var3); } - - return var2; } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java index e93cd5c4..283eaa86 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java @@ -86,91 +86,79 @@ public class OnlCgformHeadController { } @PostMapping({"/add"}) - public Result a(@RequestBody OnlCgformHead var1) { - Result var2 = new Result(); - + public Result add(@RequestBody OnlCgformHead var1) { try { this.onlCgformHeadService.save(var1); - var2.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception var4) { log.error(var4.getMessage(), var4); - var2.error500("操作失败"); + return Result.error500("操作失败"); } - - return var2; } @PutMapping({"/edit"}) - public Result b(@RequestBody OnlCgformHead var1) { - Result var2 = new Result(); + public Result edit(@RequestBody OnlCgformHead var1) { OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1.getId()); if (var3 == null) { - var2.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); } else { boolean var4 = this.onlCgformHeadService.updateById(var1); if (var4) { - var2.success("修改成功!"); + return Result.OK("修改成功!"); } } - - return var2; + return Result.OK(); } @DeleteMapping({"/delete"}) - public Result a(@RequestParam(name = "id",required = true) String var1) { + public Result delete(@RequestParam(name = "id",required = true) String id) { try { - this.onlCgformHeadService.deleteRecordAndTable(var1); - } catch (DBException var3) { - return Result.error("删除失败" + var3.getMessage()); - } catch (SQLException var4) { - return Result.error("删除失败" + var4.getMessage()); + this.onlCgformHeadService.deleteRecordAndTable(id); + } catch (DBException e) { + return Result.error("删除失败" + e.getMessage()); + } catch (SQLException e) { + return Result.error("删除失败" + e.getMessage()); } return Result.OK("删除成功!"); } @DeleteMapping({"/removeRecord"}) - public Result b(@RequestParam(name = "id",required = true) String var1) { + public Result removeRecord(@RequestParam(name = "id",required = true) String id) { try { - this.onlCgformHeadService.deleteRecord(var1); - } catch (DBException var3) { - return Result.error("移除失败" + var3.getMessage()); - } catch (SQLException var4) { - return Result.error("移除失败" + var4.getMessage()); + this.onlCgformHeadService.deleteRecord(id); + } catch (DBException e) { + return Result.error("移除失败" + e.getMessage()); + } catch (SQLException e) { + return Result.error("移除失败" + e.getMessage()); } return Result.OK("移除成功!"); } @DeleteMapping({"/deleteBatch"}) - public Result a(@RequestParam(name = "ids",required = true) String var1, @RequestParam(name = "flag") String var2) { - Result var3 = new Result(); + public Result deleteBatch(@RequestParam(name = "ids",required = true) String var1, @RequestParam(name = "flag") String var2) { if (var1 != null && !"".equals(var1.trim())) { this.onlCgformHeadService.deleteBatch(var1, var2); - var3.success("删除成功!"); + return Result.OK("删除成功!"); } else { - var3.error500("参数不识别！"); + return Result.error500("参数不识别！"); } - - return var3; } @GetMapping({"/queryById"}) - public Result c(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); - if (var3 == null) { - var2.error500("未找到对应实体"); + public Result queryById(@RequestParam(name = "id",required = true) String id) { + OnlCgformHead cgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(id); + if (cgformHead == null) { + return Result.error500("未找到对应实体"); } else { - var2.setResult(var3); - var2.setSuccess(true); + return Result.OK(cgformHead); } - return var2; } @GetMapping({"/queryByTableNames"}) - public Result d(@RequestParam(name = "tableNames",required = true) String var1) { + public Result queryByTableNames(@RequestParam(name = "tableNames",required = true) String var1) { LambdaQueryWrapper var2 = new LambdaQueryWrapper(); String[] var3 = var1.split(","); var2.in(OnlCgformHead::getTableName, Arrays.asList(var3)); @@ -179,7 +167,7 @@ public class OnlCgformHeadController { } @PostMapping({"/enhanceJs/{code}"}) - public Result a(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { + public Result addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { try { var2.setCgformHeadId(var1); this.onlCgformHeadService.saveEnhance(var2); @@ -191,7 +179,7 @@ public class OnlCgformHeadController { } @GetMapping({"/enhanceJs/{code}"}) - public Result a(@PathVariable("code") String var1, HttpServletRequest var2) { + public Result getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) { try { String var3 = var2.getParameter("type"); OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhance(var1, var3); @@ -203,7 +191,7 @@ public class OnlCgformHeadController { } @PutMapping({"/enhanceJs/{code}"}) - public Result b(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { + public Result editEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { try { var2.setCgformHeadId(var1); this.onlCgformHeadService.editEnhance(var2); @@ -215,7 +203,7 @@ public class OnlCgformHeadController { } @GetMapping({"/enhanceButton/{formId}"}) - public Result b(@PathVariable("formId") String var1, HttpServletRequest var2) { + public Result getEnhanceButton(@PathVariable("formId") String var1, HttpServletRequest var2) { try { List var3 = this.onlCgformHeadService.queryButtonList(var1); return var3 != null && var3.size() != 0 ? Result.OK(var3) : Result.error("查询为空"); @@ -226,14 +214,14 @@ public class OnlCgformHeadController { } @GetMapping({"/enhanceSql/{formId}"}) - public Result c(@PathVariable("formId") String var1, HttpServletRequest var2) { + public Result getEnhanceSql(@PathVariable("formId") String var1, HttpServletRequest var2) { List var3 = this.onlCgformEnhanceService.queryEnhanceSqlList(var1); return Result.OK(var3); } @RequiresRoles({"admin"}) @PostMapping({"/enhanceSql/{formId}"}) - public Result a(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { + public Result addEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { try { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { @@ -250,7 +238,7 @@ public class OnlCgformHeadController { @RequiresRoles({"admin"}) @PutMapping({"/enhanceSql/{formId}"}) - public Result b(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { + public Result editEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { try { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { @@ -266,7 +254,7 @@ public class OnlCgformHeadController { } @DeleteMapping({"/enhanceSql"}) - public Result e(@RequestParam(name = "id",required = true) String var1) { + public Result deletenhanceSql(@RequestParam(name = "id",required = true) String var1) { try { this.onlCgformEnhanceService.deleteEnhanceSql(var1); return Result.OK("删除成功"); @@ -277,7 +265,7 @@ public class OnlCgformHeadController { } @DeleteMapping({"/deletebatchEnhanceSql"}) - public Result f(@RequestParam(name = "ids",required = true) String var1) { + public Result deletebatchEnhanceSql(@RequestParam(name = "ids",required = true) String var1) { try { List var2 = Arrays.asList(var1.split(",")); this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2); @@ -289,18 +277,18 @@ public class OnlCgformHeadController { } @GetMapping({"/enhanceJava/{formId}"}) - public Result a(@PathVariable("formId") String var1, OnlCgformEnhanceJava var2) { - List var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(var1); + public Result getEnhanceJava(@PathVariable("formId") String formId, OnlCgformEnhanceJava var2) { + List var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(formId); return Result.OK(var3); } @PostMapping({"/enhanceJava/{formId}"}) - public Result b(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) { + public Result addEnhanceJava(@PathVariable("formId") String formId, @RequestBody OnlCgformEnhanceJava var2) { try { if (!CgformUtil.a(var2)) { return Result.error("类实例化失败，请检查!"); } else { - var2.setCgformHeadId(var1); + var2.setCgformHeadId(formId); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { this.onlCgformEnhanceService.saveEnhanceJava(var2); return Result.OK("保存成功!"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java index 78b8dd00..05f124bf 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java @@ -34,97 +34,84 @@ public class OnlCgformIndexController { } @GetMapping({"/listByHeadId"}) - public Result a(@RequestParam("headId") String var1) { - QueryWrapper var2 = new QueryWrapper(); - var2.eq("cgform_head_id", var1); - var2.eq("del_flag", CommonConstant.DEL_FLAG_0); - var2.orderByDesc("create_time"); - List var3 = this.onlCgformIndexService.list(var2); - return Result.OK(var3); + public Result listByHeadId(@RequestParam("headId") String headId) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("cgform_head_id", headId); + queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0); + queryWrapper.orderByDesc("create_time"); + List cgformIndexList = this.onlCgformIndexService.list(queryWrapper); + return Result.OK(cgformIndexList); } @GetMapping({"/list"}) - public Result> a(OnlCgformIndex var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { - Result var5 = new Result(); - QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); - Page var7 = new Page((long)var2, (long)var3); - IPage var8 = this.onlCgformIndexService.page(var7, var6); - var5.setSuccess(true); - var5.setResult(var8); - return var5; + public Result> list(OnlCgformIndex cgformIndex, + @RequestParam(name = "pageNo",defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize",defaultValue = "10") Integer pageSize, + HttpServletRequest request) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cgformIndex, request.getParameterMap()); + Page page = new Page((long)pageNo, (long)pageSize); + IPage cgformIndexPage = this.onlCgformIndexService.page(page, queryWrapper); + return Result.OK(cgformIndexPage); } @PostMapping({"/add"}) - public Result a(@RequestBody OnlCgformIndex var1) { - Result var2 = new Result(); - + public Result add(@RequestBody OnlCgformIndex cgformIndex) { try { - this.onlCgformIndexService.save(var1); - var2.success("添加成功！"); - } catch (Exception var4) { - log.error(var4.getMessage(), var4); - var2.error500("操作失败"); + this.onlCgformIndexService.save(cgformIndex); + return Result.OK("添加成功！"); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error500("操作失败"); } - - return var2; } @PutMapping({"/edit"}) - public Result b(@RequestBody OnlCgformIndex var1) { - Result var2 = new Result(); - OnlCgformIndex var3 = (OnlCgformIndex)this.onlCgformIndexService.getById(var1.getId()); - if (var3 == null) { - var2.error500("未找到对应实体"); + public Result edit(@RequestBody OnlCgformIndex cgformIndex) { + OnlCgformIndex existCgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(cgformIndex.getId()); + if (existCgformIndex == null) { + return Result.error500("未找到对应实体"); } else { - boolean var4 = this.onlCgformIndexService.updateById(var1); - if (var4) { - var2.success("修改成功!"); + boolean flag = this.onlCgformIndexService.updateById(cgformIndex); + if (flag) { + return Result.OK("修改成功!"); } } - return var2; + return Result.OK(); } @DeleteMapping({"/delete"}) - public Result b(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); - OnlCgformIndex var3 = (OnlCgformIndex)this.onlCgformIndexService.getById(var1); - if (var3 == null) { - var2.error500("未找到对应实体"); + public Result delete(@RequestParam(name = "id",required = true) String id) { + OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(id); + if (cgformIndex == null) { + return Result.error500("未找到对应实体"); } else { - boolean var4 = this.onlCgformIndexService.removeById(var1); - if (var4) { - var2.success("删除成功!"); + boolean flag = this.onlCgformIndexService.removeById(id); + if (flag) { + return Result.OK("删除成功!"); } } - return var2; + return Result.OK(); } @DeleteMapping({"/deleteBatch"}) - public Result c(@RequestParam(name = "ids",required = true) String var1) { - Result var2 = new Result(); - if (var1 != null && !"".equals(var1.trim())) { - this.onlCgformIndexService.removeByIds(Arrays.asList(var1.split(","))); - var2.success("删除成功!"); + public Result deleteBatch(@RequestParam(name = "ids",required = true) String ids) { + if (ids != null && !"".equals(ids.trim())) { + this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("删除成功!"); } else { - var2.error500("参数不识别！"); + return Result.error500("参数不识别！"); } - - return var2; } @GetMapping({"/queryById"}) - public Result d(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); - OnlCgformIndex var3 = (OnlCgformIndex)this.onlCgformIndexService.getById(var1); - if (var3 == null) { - var2.error500("未找到对应实体"); + public Result queryById(@RequestParam(name = "id",required = true) String var1) { + OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(var1); + if (cgformIndex == null) { + return Result.error500("未找到对应实体"); } else { - var2.setResult(var3); - var2.setSuccess(true); + return Result.OK(cgformIndex); } - - return var2; } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java index edf7ac6c..353256af 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java @@ -137,9 +137,7 @@ public class OnlCgreportHeadController { } @PostMapping({"/add"}) - public Result a(@RequestBody OnlCgreportModel var1) { - Result var2 = new Result(); - + public Result add(@RequestBody OnlCgreportModel var1) { try { String var3 = CgformUtil.a(); OnlCgreportHead var4 = var1.getHead(); @@ -166,40 +164,38 @@ public class OnlCgreportHeadController { this.onlCgreportHeadService.save(var4); this.onlCgreportParamService.saveBatch(var5); this.onlCgreportItemService.saveBatch(var6); - var2.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception var9) { log.error(var9.getMessage(), var9); - var2.error500("操作失败"); + return Result.error500("操作失败"); } - - return var2; } @PutMapping({"/editAll"}) - public Result b(@RequestBody OnlCgreportModel var1) { + public Result editAll(@RequestBody OnlCgreportModel cgreportModel) { try { - return this.onlCgreportHeadService.editAll(var1); - } catch (Exception var3) { - log.error(var3.getMessage(), var3); + return this.onlCgreportHeadService.editAll(cgreportModel); + } catch (Exception e) { + log.error(e.getMessage(), e); return Result.error("操作失败"); } } @DeleteMapping({"/delete"}) - public Result a(@RequestParam(name = "id",required = true) String var1) { - return this.onlCgreportHeadService.delete(var1); + public Result delete(@RequestParam(name = "id",required = true) String id) { + return this.onlCgreportHeadService.delete(id); } @DeleteMapping({"/deleteBatch"}) - public Result b(@RequestParam(name = "ids",required = true) String var1) { - return this.onlCgreportHeadService.bathDelete(var1.split(",")); + public Result deleteBatch(@RequestParam(name = "ids",required = true) String ids) { + return this.onlCgreportHeadService.bathDelete(ids.split(",")); } @GetMapping({"/queryById"}) - public Result c(@RequestParam(name = "id",required = true) String var1) { - Result var2 = new Result(); - OnlCgreportHead var3 = (OnlCgreportHead)this.onlCgreportHeadService.getById(var1); - var2.setResult(var3); - return var2; + public Result queryById(@RequestParam(name = "id",required = true) String id) { + Result result = new Result(); + OnlCgreportHead cgreportHead = (OnlCgreportHead)this.onlCgreportHeadService.getById(id); + result.setResult(cgreportHead); + return result; } } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java index 794eda9b..d48741e8 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java @@ -142,7 +142,7 @@ public class MockController { log.info(map.toString()); } res.setResult(list); - res.success("查询成功"); + res.setMessage("查询成功"); } catch (Exception e) { res.error500("查询失败"+e.getMessage()); } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java index 9024a22f..f45ef921 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java @@ -82,16 +82,14 @@ public class JoaDemoController { * @return */ @PostMapping(value = "/add") - public Result add(@RequestBody JoaDemo joaDemo) { - Result result = new Result(); + public Result add(@RequestBody JoaDemo joaDemo) { try { joaDemoService.save(joaDemo); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -100,20 +98,18 @@ public class JoaDemoController { * @return */ @PutMapping(value = "/edit") - public Result edit(@RequestBody JoaDemo joaDemo) { - Result result = new Result(); + public Result edit(@RequestBody JoaDemo joaDemo) { JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId()); if(joaDemoEntity==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = joaDemoService.updateById(joaDemo); - //TODO 返回false说明什么？ if(ok) { - result.success("修改成功!"); + return Result.OK("修改成功!"); } } - - return result; + + return Result.OK(); } /** @@ -122,19 +118,17 @@ public class JoaDemoController { * @return */ @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { JoaDemo joaDemo = joaDemoService.getById(id); if(joaDemo==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = joaDemoService.removeById(id); if(ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - - return result; + return Result.OK(); } /** @@ -143,15 +137,13 @@ public class JoaDemoController { * @return */ @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); }else { this.joaDemoService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } /** @@ -161,15 +153,12 @@ public class JoaDemoController { */ @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); JoaDemo joaDemo = joaDemoService.getById(id); if(joaDemo==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { - result.setResult(joaDemo); - result.setSuccess(true); + return Result.OK(joaDemo); } - return result; } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java index 04109888..3a13662a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/cas/controller/CasClientController.java @@ -102,11 +102,11 @@ public class CasClientController { obj.put("token", token); obj.put("userInfo", sysUser); result.setResult(obj); - result.success("登录成功"); + result.setMessage("登录成功"); } catch (Exception e) { - //e.printStackTrace(); - result.error500(e.getMessage()); + result.setSuccess(false); + result.setMessage(e.getMessage()); } return new HttpEntity<>(result); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java index b884c959..38a80960 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java @@ -150,21 +150,18 @@ public class SysMessageTemplateController extends JeroController sendMessage(@RequestBody MsgParams msgParams) { - Result result = new Result(); + public Result sendMessage(@RequestBody MsgParams msgParams) { Map map = null; try { map = (Map) JSON.parse(msgParams.getTestData()); } catch (Exception e) { - result.error500("解析Json出错！"); - return result; + return Result.error500("解析Json出错！"); } boolean is_sendSuccess = pushMsgUtil.sendMessage(msgParams.getMsgType(), msgParams.getTemplateCode(), map, msgParams.getReceiver()); if (is_sendSuccess) { - result.success("发送消息任务添加成功！"); + return Result.OK("发送消息任务添加成功！"); } else { - result.error500("发送消息任务添加失败！"); + return Result.error500("发送消息任务添加失败！"); } - return result; } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java index 10e79edd..15047492 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/controller/ActuatorRedisController.java @@ -109,9 +109,9 @@ public class ActuatorRedisController { log.info(map.toString()); } res.setResult(list); - res.success("查询成功"); + res.setMessage("查询成功"); } catch (Exception e) { - res.error500("查询失败"+e.getMessage()); + return Result.error500("查询失败"+e.getMessage()); } return res; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index b9bf4a6e..1cdc46ab 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -47,33 +47,29 @@ public class OSSFileController { @PostMapping("/upload") //@RequiresRoles("admin") public Result upload(@RequestParam("file") MultipartFile multipartFile) { - Result result = new Result(); try { ossFileService.upload(multipartFile); - result.success("上传成功！"); + return Result.OK("上传成功！"); } catch (Exception ex) { log.info(ex.getMessage(), ex); - result.error500("上传失败"); + return Result.error500("上传失败"); } - return result; } @ResponseBody @DeleteMapping("/delete") public Result delete(@RequestParam(name = "id") String id) { - Result result = new Result(); OSSFile file = ossFileService.getById(id); if (file == null) { - result.error500("未找到对应实体"); - } - else { + return Result.error500("未找到对应实体"); + } else { boolean ok = ossFileService.delete(file); if (ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - return result; + return Result.OK(); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java index 83f4380c..5b495cce 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java @@ -163,7 +163,7 @@ public class QuartzJobController { return Result.error("定时任务不存在！"); } quartzJobService.pause(job); - return Result.ok("暂停定时任务成功"); + return Result.OK("暂停定时任务成功"); } /** @@ -181,8 +181,7 @@ public class QuartzJobController { return Result.error("定时任务不存在！"); } quartzJobService.resumeJob(job); - //scheduler.resumeJob(JobKey.jobKey(job.getJobClassName().trim())); - return Result.ok("恢复定时任务成功"); + return Result.OK("恢复定时任务成功"); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java index edec4faf..c59687f3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java @@ -57,7 +57,7 @@ public class DuplicateCheckController { if (num == null || num == 0) { // 该值可用 - return Result.ok("该值可用！"); + return Result.OK("该值可用！"); } else { // 该值不可用 log.info("该值不可用，系统中已存在！"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java index 99e81b96..2f34be16 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java @@ -1,7 +1,6 @@ package com.jero.modules.system.controller; import java.io.IOException; -import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -11,6 +10,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.util.RedisUtil; +import com.jero.common.util.TokenUtils; import com.jero.modules.system.util.XSSUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; @@ -18,7 +20,6 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.CommonSendStatus; import com.jero.common.constant.WebsocketConst; -import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.oConvertUtils; @@ -34,11 +35,9 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.context.annotation.Lazy; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; @@ -51,6 +50,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import static com.jero.common.constant.CommonConstant.ANNOUNCEMENT_SEND_STATUS_1; + /** * @Title: Controller * @Description: 系统通告表 @@ -68,6 +69,11 @@ public class SysAnnouncementController { private ISysAnnouncementSendService sysAnnouncementSendService; @Resource private WebSocket webSocket; + @Autowired + private ISysBaseAPI sysBaseAPI; + @Autowired + @Lazy + private RedisUtil redisUtil; /** * 分页列表查询 @@ -108,8 +114,7 @@ public class SysAnnouncementController { * @return */ @RequestMapping(value = "/add", method = RequestMethod.POST) - public Result add(@RequestBody SysAnnouncement sysAnnouncement) { - Result result = new Result(); + public Result add(@RequestBody SysAnnouncement sysAnnouncement) { try { // update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题 String title = XSSUtils.striptXSS(sysAnnouncement.getTitile()); @@ -118,12 +123,11 @@ public class SysAnnouncementController { sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); sysAnnouncement.setSendStatus(CommonSendStatus.UNPUBLISHED_STATUS_0);//未发布 sysAnnouncementService.saveAnnouncement(sysAnnouncement); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -132,24 +136,22 @@ public class SysAnnouncementController { * @return */ @RequestMapping(value = "/edit", method = RequestMethod.PUT) - public Result eidt(@RequestBody SysAnnouncement sysAnnouncement) { - Result result = new Result(); + public Result eidt(@RequestBody SysAnnouncement sysAnnouncement) { SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId()); if(sysAnnouncementEntity==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { // update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题 String title = XSSUtils.striptXSS(sysAnnouncement.getTitile()); sysAnnouncement.setTitile(title); // update-end-author:liusq date:20210804 for:标题处理xss攻击的问题 boolean ok = sysAnnouncementService.upDateAnnouncement(sysAnnouncement); - //TODO 返回false说明什么？ if(ok) { - result.success("修改成功!"); + return Result.OK("修改成功!"); } } - return result; + return Result.OK(); } /** @@ -158,20 +160,19 @@ public class SysAnnouncementController { * @return */ @RequestMapping(value = "/delete", method = RequestMethod.DELETE) - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString()); boolean ok = sysAnnouncementService.updateById(sysAnnouncement); if(ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - return result; + return Result.OK(); } /** @@ -180,10 +181,9 @@ public class SysAnnouncementController { * @return */ @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); }else { String[] id = ids.split(","); for(int i=0;i result = new Result(); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { - result.setResult(sysAnnouncement); - result.setSuccess(true); + return Result.OK(sysAnnouncement); } - return result; } /** @@ -221,10 +218,9 @@ public class SysAnnouncementController { */ @RequestMapping(value = "/doReleaseData", method = RequestMethod.GET) public Result doReleaseData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { - Result result = new Result(); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { sysAnnouncement.setSendStatus(CommonSendStatus.PUBLISHED_STATUS_1);//发布中 sysAnnouncement.setSendTime(new Date()); @@ -232,7 +228,6 @@ public class SysAnnouncementController { sysAnnouncement.setSender(currentUserName); boolean ok = sysAnnouncementService.updateById(sysAnnouncement); if(ok) { - result.success("该系统通知发布成功"); if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) { JSONObject obj = new JSONObject(); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC); @@ -251,10 +246,11 @@ public class SysAnnouncementController { obj.put(WebsocketConst.MSG_TXT, sysAnnouncement.getTitile()); webSocket.sendMessage(userIds, obj.toJSONString()); } + return Result.OK("该系统通知发布成功"); } } - return result; + return Result.OK(); } /** @@ -263,21 +259,20 @@ public class SysAnnouncementController { * @return */ @RequestMapping(value = "/doReovkeData", method = RequestMethod.GET) - public Result doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { - Result result = new Result(); + public Result doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) { SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布 sysAnnouncement.setCancelTime(new Date()); boolean ok = sysAnnouncementService.updateById(sysAnnouncement); if(ok) { - result.success("该系统通知撤销成功"); + return Result.OK("该系统通知撤销成功"); } } - return result; + return Result.OK(); } /** @@ -432,4 +427,34 @@ public class SysAnnouncementController { } return result; } + + /** + * 通告查看详情页面 + * @param modelAndView + * @param id + * @return + */ + @GetMapping("/show/{id}") + public ModelAndView showContent(ModelAndView modelAndView, @PathVariable("id") String id, HttpServletRequest request) { + SysAnnouncement announcement = sysAnnouncementService.getById(id); + if (announcement != null) { + boolean tokenOK = false; + try { + // 验证Token有效性 + tokenOK = TokenUtils.verifyToken(request, sysBaseAPI, redisUtil); + } catch (Exception ignored) { + ignored.printStackTrace(); + } + // 判断是否传递了Token，并且Token有效，如果传了就不做查看限制，直接返回 + // 如果Token无效，就做查看限制：只能查看已发布的 + if (tokenOK || ANNOUNCEMENT_SEND_STATUS_1.equals(announcement.getSendStatus())) { + modelAndView.addObject("data", announcement); + modelAndView.setViewName("announcement/showContent"); + return modelAndView; + } + } + modelAndView.setStatus(HttpStatus.NOT_FOUND); + return modelAndView; + } + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index fe8cc372..7b184e95 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -88,16 +88,14 @@ public class SysAnnouncementSendController { * @return */ @PostMapping(value = "/add") - public Result add(@RequestBody SysAnnouncementSend sysAnnouncementSend) { - Result result = new Result(); + public Result add(@RequestBody SysAnnouncementSend sysAnnouncementSend) { try { sysAnnouncementSendService.save(sysAnnouncementSend); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -106,20 +104,18 @@ public class SysAnnouncementSendController { * @return */ @PutMapping(value = "/edit") - public Result eidt(@RequestBody SysAnnouncementSend sysAnnouncementSend) { - Result result = new Result(); + public Result edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) { SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId()); if(sysAnnouncementSendEntity==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend); - //TODO 返回false说明什么？ if(ok) { - result.success("修改成功!"); + return Result.OK("修改成功!"); } } - return result; + return Result.OK(); } /** @@ -128,19 +124,18 @@ public class SysAnnouncementSendController { * @return */ @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysAnnouncementSendService.removeById(id); if(ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - - return result; + + return Result.OK(); } /** @@ -149,15 +144,13 @@ public class SysAnnouncementSendController { * @return */ @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + if(ids == null || "".equals(ids.trim())) { + return Result.error500("参数不识别！"); }else { this.sysAnnouncementSendService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } /** @@ -170,12 +163,10 @@ public class SysAnnouncementSendController { Result result = new Result(); SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { - result.setResult(sysAnnouncementSend); - result.setSuccess(true); + return Result.OK(sysAnnouncementSend); } - return result; } /** @@ -226,7 +217,6 @@ public class SysAnnouncementSendController { */ @PutMapping(value = "/readAll") public Result readAll() { - Result result = new Result(); LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); String userId = sysUser.getId(); LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); @@ -235,8 +225,6 @@ public class SysAnnouncementSendController { updateWrapper.last("where user_id ='"+userId+"'"); SysAnnouncementSend announcementSend = new SysAnnouncementSend(); sysAnnouncementSendService.update(announcementSend, updateWrapper); - result.setSuccess(true); - result.setMessage("全部已读"); - return result; + return Result.OK("全部已读"); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 58486b02..6648cdfc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -98,16 +98,14 @@ public class SysCategoryController { */ @RequiresPermissions("sys:category:add") @PostMapping(value = "/add") - public Result add(@RequestBody SysCategory sysCategory) { - Result result = new Result(); + public Result add(@RequestBody SysCategory sysCategory) { try { sysCategoryService.addSysCategory(sysCategory); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -117,16 +115,14 @@ public class SysCategoryController { */ @RequiresPermissions("sys:category:edit") @PutMapping(value = "/edit") - public Result edit(@RequestBody SysCategory sysCategory) { - Result result = new Result(); + public Result edit(@RequestBody SysCategory sysCategory) { SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId()); if(sysCategoryEntity==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { sysCategoryService.updateSysCategory(sysCategory); - result.success("修改成功!"); + return Result.OK("修改成功!"); } - return result; } /** @@ -136,17 +132,14 @@ public class SysCategoryController { */ @RequiresPermissions("sys:category:list") @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { this.sysCategoryService.deleteSysCategory(id); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - - return result; } /** @@ -156,15 +149,13 @@ public class SysCategoryController { */ @RequiresPermissions("sys:category:del") @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); }else { this.sysCategoryService.deleteSysCategory(ids); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } /** @@ -175,15 +166,12 @@ public class SysCategoryController { @RequiresPermissions("sys:category:list") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { - result.setResult(sysCategory); - result.setSuccess(true); + return Result.OK(sysCategory); } - return result; } /** @@ -277,28 +265,22 @@ public class SysCategoryController { @RequiresPermissions("sys:category:list") @RequestMapping(value = "/loadOne", method = RequestMethod.GET) public Result loadOne(@RequestParam(name="field") String field,@RequestParam(name="val") String val) { - Result result = new Result(); try { QueryWrapper query = new QueryWrapper(); query.eq(field, val); List ls = this.sysCategoryService.list(query); if(ls==null || ls.size()==0) { - result.setMessage("查询无果"); - result.setSuccess(false); + return Result.error("查询无果"); }else if(ls.size()>1) { - result.setMessage("查询数据异常,["+field+"]存在多个值:"+val); - result.setSuccess(false); + return Result.error("查询数据异常,["+field+"]存在多个值:"+val); }else { - result.setSuccess(true); - result.setResult(ls.get(0)); + return Result.OK(ls.get(0)); } } catch (Exception e) { e.printStackTrace(); - result.setMessage(e.getMessage()); - result.setSuccess(false); + return Result.error(e.getMessage()); } - return result; } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index c6823c23..ae2d237a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -174,21 +174,16 @@ public class SysDepartController { @RequiresPermissions("sys:depart:add") @RequestMapping(value = "/add", method = RequestMethod.POST) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) - public Result add(@RequestBody SysDepart sysDepart, HttpServletRequest request) { - Result result = new Result(); + public Result add(@RequestBody SysDepart sysDepart, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); try { sysDepart.setCreateBy(username); sysDepartService.saveDepartData(sysDepart, username); - //清除部门树内存 - // FindsDepartsChildrenUtil.clearSysDepartTreeList(); - // FindsDepartsChildrenUtil.clearDepartIdModel(); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -201,24 +196,19 @@ public class SysDepartController { @RequiresPermissions("sys:depart:edit") @RequestMapping(value = "/edit", method = RequestMethod.PUT) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) - public Result edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) { + public Result edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) { String username = JwtUtil.getUserNameByToken(request); sysDepart.setUpdateBy(username); - Result result = new Result(); SysDepart sysDepartEntity = sysDepartService.getById(sysDepart.getId()); if (sysDepartEntity == null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); } else { boolean ok = sysDepartService.updateDepartDataById(sysDepart, username); - // TODO 返回false说明什么？ if (ok) { - //清除部门树内存 - //FindsDepartsChildrenUtil.clearSysDepartTreeList(); - //FindsDepartsChildrenUtil.clearDepartIdModel(); - result.success("修改成功!"); + return Result.OK("修改成功!"); } } - return result; + return Result.OK(); } /** @@ -230,22 +220,17 @@ public class SysDepartController { @RequiresPermissions("sys:depart:del") @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) - public Result delete(@RequestParam(name="id",required=true) String id) { - - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { SysDepart sysDepart = sysDepartService.getById(id); if(sysDepart==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysDepartService.delete(id); if(ok) { - //清除部门树内存 - //FindsDepartsChildrenUtil.clearSysDepartTreeList(); - // FindsDepartsChildrenUtil.clearDepartIdModel(); - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - return result; + return Result.OK(); } @@ -259,16 +244,13 @@ public class SysDepartController { @RequiresPermissions("sys:depart:del") @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - - Result result = new Result(); + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { if (ids == null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); } else { this.sysDepartService.deleteBatchWithChildren(Arrays.asList(ids.split(","))); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } /** @@ -279,34 +261,13 @@ public class SysDepartController { @RequiresPermissions("sys:depart:list") @RequestMapping(value = "/queryIdTree", method = RequestMethod.GET) public Result> queryIdTree() { -// Result> result = new Result>(); -// List idList; -// try { -// idList = FindsDepartsChildrenUtil.wrapDepartIdModel(); -// if (idList != null && idList.size() > 0) { -// result.setResult(idList); -// result.setSuccess(true); -// } else { -// sysDepartService.queryTreeList(); -// idList = FindsDepartsChildrenUtil.wrapDepartIdModel(); -// result.setResult(idList); -// result.setSuccess(true); -// } -// return result; -// } catch (Exception e) { -// log.error(e.getMessage(),e); -// result.setSuccess(false); -// return result; -// } - Result> result = new Result<>(); try { List list = sysDepartService.queryDepartIdTreeList(); - result.setResult(list); - result.setSuccess(true); + return Result.OK(list); } catch (Exception e) { log.error(e.getMessage(),e); + return Result.error("查询失败"); } - return result; } /** @@ -320,7 +281,6 @@ public class SysDepartController { @RequiresPermissions("sys:depart:list") @RequestMapping(value = "/searchBy", method = RequestMethod.GET) public Result> searchBy(@RequestParam(name = "keyWord", required = true) String keyWord,@RequestParam(name = "myDeptSearch", required = false) String myDeptSearch) { - Result> result = new Result>(); //部门查询，myDeptSearch为1时为我的部门查询，登录用户为上级时查只查负责部门下数据 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String departIds = null; @@ -329,12 +289,9 @@ public class SysDepartController { } List treeList = this.sysDepartService.searhBy(keyWord,myDeptSearch,departIds); if (treeList == null || treeList.size() == 0) { - result.setSuccess(false); - result.setMessage("未查询匹配数据！"); - return result; + return Result.error("未查询匹配数据！"); } - result.setResult(treeList); - return result; + return Result.OK(treeList); } @@ -456,7 +413,6 @@ public class SysDepartController { @RequiresPermissions("sys:depart:list") @GetMapping("listAll") public Result> listAll(@RequestParam(name = "id", required = false) String id) { - Result> result = new Result<>(); LambdaQueryWrapper query = new LambdaQueryWrapper(); query.orderByAsc(SysDepart::getOrgCode); if(oConvertUtils.isNotEmpty(id)){ @@ -464,9 +420,7 @@ public class SysDepartController { query.in(SysDepart::getId,arr); } List ls = this.sysDepartService.list(query); - result.setSuccess(true); - result.setResult(ls); - return result; + return Result.OK(ls); } /** * 查询数据 查出所有部门,并以树结构数据格式响应给前端 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java index ad83c3e7..e5bc5e51 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java @@ -216,21 +216,19 @@ public class SysDepartPermissionController extends JeroController saveDeptRolePermission(@RequestBody JSONObject json) { + public Result saveDeptRolePermission(@RequestBody JSONObject json) { long start = System.currentTimeMillis(); - Result result = new Result<>(); try { String roleId = json.getString("roleId"); String permissionIds = json.getString("permissionIds"); String lastPermissionIds = json.getString("lastpermissionIds"); this.sysDepartRolePermissionService.saveDeptRolePermission(roleId, permissionIds, lastPermissionIds); - result.success("保存成功！"); log.info("======部门角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); + return Result.OK("保存成功！"); } catch (Exception e) { - result.error500("授权失败！"); log.error(e.getMessage(), e); + return Result.error500("授权失败！"); } - return result; } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 9bbd8713..5627712a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -338,20 +338,18 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典") @RequestMapping(value = "/add", method = RequestMethod.POST) - public Result add(@RequestBody SysDict sysDict) { - Result result = new Result(); + public Result add(@RequestBody SysDict sysDict) { try { sysDict.setCreateTime(new Date()); sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); sysDictService.save(sysDict); - result.success("保存成功！"); //添加成功后需要刷新缓存 sysDictService.refreshCache(); + return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -361,21 +359,20 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典") @RequestMapping(value = "/edit", method = RequestMethod.PUT) - public Result edit(@RequestBody SysDict sysDict) { - Result result = new Result(); + public Result edit(@RequestBody SysDict sysDict) { SysDict sysdict = sysDictService.getById(sysDict.getId()); if(sysdict==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { sysDict.setUpdateTime(new Date()); boolean ok = sysDictService.updateById(sysDict); if(ok) { - result.success("编辑成功!"); //编辑成功后需要刷新缓存 sysDictService.refreshCache(); + return Result.OK("编辑成功!"); } } - return result; + return Result.OK(); } /** @@ -386,15 +383,13 @@ public class SysDictController { @ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典") @DeleteMapping(value = "/delete") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { boolean ok = sysDictService.removeById(id); if(ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); }else{ - result.error500("删除失败!"); + return Result.error500("删除失败!"); } - return result; } /** @@ -405,15 +400,13 @@ public class SysDictController { @ApiOperation(value = "字典控制器-批量字典", notes = "字典控制器-批量字典") @DeleteMapping(value = "/deleteBatch") @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); }else { sysDictService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } /** @@ -525,11 +518,8 @@ public class SysDictController { */ @GetMapping(value = "/deleteList") public Result> deleteList() { - Result> result = new Result>(); List list = this.sysDictService.queryDeleteList(); - result.setSuccess(true); - result.setResult(list); - return result; + return Result.OK(list); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 4a2f3dbe..5e27d093 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -77,17 +77,15 @@ public class SysDictItemController { @RequiresPermissions("sys:dict:list") @RequestMapping(value = "/add", method = RequestMethod.POST) @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result add(@RequestBody SysDictItem sysDictItem) { - Result result = new Result(); + public Result add(@RequestBody SysDictItem sysDictItem) { try { sysDictItem.setCreateTime(new Date()); sysDictItemService.save(sysDictItem); - result.success("保存成功！"); + return Result.OK("保存成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -99,20 +97,18 @@ public class SysDictItemController { @RequiresPermissions("sys:dict:list") @RequestMapping(value = "/edit", method = RequestMethod.PUT) @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result edit(@RequestBody SysDictItem sysDictItem) { - Result result = new Result(); + public Result edit(@RequestBody SysDictItem sysDictItem) { SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); if(sysdict==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { sysDictItem.setUpdateTime(new Date()); boolean ok = sysDictItemService.updateById(sysDictItem); - //TODO 返回false说明什么？ if(ok) { - result.success("编辑成功!"); + return Result.OK("编辑成功!"); } } - return result; + return Result.OK(); } /** @@ -124,18 +120,17 @@ public class SysDictItemController { @RequiresPermissions("sys:dict:list") @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { SysDictItem joinSystem = sysDictItemService.getById(id); if(joinSystem==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysDictItemService.removeById(id); if(ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - return result; + return Result.OK(); } /** @@ -147,15 +142,13 @@ public class SysDictItemController { @RequiresPermissions("sys:dict:list") @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); }else { this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java index 3637cd3f..8ef59466 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java @@ -58,9 +58,6 @@ public class SysLogController { if(oConvertUtils.isNotEmpty(keyWord)) { queryWrapper.like("log_content",keyWord); } - //TODO 过滤逻辑处理 - //TODO begin、end逻辑处理 - //TODO 一个强大的功能，前端传一个字段字符串，后台只返回这些字符串对应的字段 //创建时间/创建人的赋值 IPage pageList = sysLogService.page(page, queryWrapper); log.info("查询当前页："+pageList.getCurrent()); @@ -78,18 +75,17 @@ public class SysLogController { * @return */ @RequestMapping(value = "/delete", method = RequestMethod.DELETE) - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { SysLog sysLog = sysLogService.getById(id); if(sysLog==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysLogService.removeById(id); if(ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - return result; + return Result.OK(); } /** @@ -98,19 +94,17 @@ public class SysLogController { * @return */ @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); }else { if("allclear".equals(ids)) { this.sysLogService.removeAll(); - result.success("清除成功!"); + return Result.OK("清除成功!"); } this.sysLogService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index 74553284..cdd625e4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -229,7 +229,7 @@ public class SysPermissionController { //全部权限配置集合（按钮权限，访问权限） json.put("allAuth", allauthjsonArray); result.setResult(json); - result.success("查询成功"); + result.setMessage("查询成功"); } catch (Exception e) { result.error500("查询失败:" + e.getMessage()); log.error(e.getMessage(), e); @@ -244,17 +244,15 @@ public class SysPermissionController { */ //@RequiresRoles({ "admin" }) @RequestMapping(value = "/add", method = RequestMethod.POST) - public Result add(@RequestBody SysPermission permission) { - Result result = new Result(); + public Result add(@RequestBody SysPermission permission) { try { permission = PermissionDataUtil.intelligentProcessData(permission); sysPermissionService.addPermission(permission); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -264,17 +262,15 @@ public class SysPermissionController { */ //@RequiresRoles({ "admin" }) @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST }) - public Result edit(@RequestBody SysPermission permission) { - Result result = new Result<>(); + public Result edit(@RequestBody SysPermission permission) { try { permission = PermissionDataUtil.intelligentProcessData(permission); sysPermissionService.editPermission(permission); - result.success("修改成功！"); + return Result.OK("修改成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -284,16 +280,14 @@ public class SysPermissionController { */ //@RequiresRoles({ "admin" }) @RequestMapping(value = "/delete", method = RequestMethod.DELETE) - public Result delete(@RequestParam(name = "id", required = true) String id) { - Result result = new Result<>(); + public Result delete(@RequestParam(name = "id", required = true) String id) { try { sysPermissionService.deletePermission(id); - result.success("删除成功!"); + return Result.OK("删除成功!"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500(e.getMessage()); + return Result.error500(e.getMessage()); } - return result; } /** @@ -303,8 +297,7 @@ public class SysPermissionController { */ //@RequiresRoles({ "admin" }) @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - Result result = new Result<>(); + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { try { String[] arr = ids.split(","); for (String id : arr) { @@ -312,12 +305,11 @@ public class SysPermissionController { sysPermissionService.deletePermission(id); } } - result.success("删除成功!"); + return Result.OK("删除成功!"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("删除成功!"); + return Result.error500("删除成功!"); } - return result; } /** @@ -402,19 +394,17 @@ public class SysPermissionController { //@RequiresRoles({ "admin" }) public Result saveRolePermission(@RequestBody JSONObject json) { long start = System.currentTimeMillis(); - Result result = new Result<>(); try { String roleId = json.getString("roleId"); String permissionIds = json.getString("permissionIds"); String lastPermissionIds = json.getString("lastpermissionIds"); this.sysRolePermissionService.saveRolePermission(roleId, permissionIds, lastPermissionIds); - result.success("保存成功！"); log.info("======角色授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); + return Result.OK("保存成功！"); } catch (Exception e) { - result.error500("授权失败！"); log.error(e.getMessage(), e); + return Result.error500("授权失败！"); } - return result; } private void getTreeList(List treeList, List metaList, SysPermissionTree temp) { @@ -690,31 +680,27 @@ public class SysPermissionController { */ //@RequiresRoles({ "admin" }) @RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST) - public Result addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { - Result result = new Result(); + public Result addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { try { sysPermissionDataRule.setCreateTime(new Date()); sysPermissionDataRuleService.savePermissionDataRule(sysPermissionDataRule); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } //@RequiresRoles({ "admin" }) @RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST }) - public Result editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { - Result result = new Result(); + public Result editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { try { sysPermissionDataRuleService.saveOrUpdate(sysPermissionDataRule); - result.success("更新成功！"); + return Result.OK("更新成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -725,16 +711,14 @@ public class SysPermissionController { */ //@RequiresRoles({ "admin" }) @RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE) - public Result deletePermissionRule(@RequestParam(name = "id", required = true) String id) { - Result result = new Result(); + public Result deletePermissionRule(@RequestParam(name = "id", required = true) String id) { try { sysPermissionDataRuleService.deletePermissionDataRule(id); - result.success("删除成功！"); + return Result.OK("删除成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -745,16 +729,13 @@ public class SysPermissionController { */ @RequestMapping(value = "/queryPermissionRule", method = RequestMethod.GET) public Result> queryPermissionRule(SysPermissionDataRule sysPermissionDataRule) { - Result> result = new Result<>(); try { List permRuleList = sysPermissionDataRuleService.queryPermissionRule(sysPermissionDataRule); - result.setResult(permRuleList); - result.success("查询成功！"); + return Result.OK("查询成功", permRuleList); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -784,18 +765,16 @@ public class SysPermissionController { //@RequiresRoles({ "admin" }) public Result saveDepartPermission(@RequestBody JSONObject json) { long start = System.currentTimeMillis(); - Result result = new Result<>(); try { String departId = json.getString("departId"); String permissionIds = json.getString("permissionIds"); String lastPermissionIds = json.getString("lastpermissionIds"); this.sysDepartPermissionService.saveDepartPermission(departId, permissionIds, lastPermissionIds); - result.success("保存成功！"); log.info("======部门授权成功=====耗时:" + (System.currentTimeMillis() - start) + "毫秒"); + return Result.OK("保存成功！"); } catch (Exception e) { - result.error500("授权失败！"); log.error(e.getMessage(), e); + return Result.error500("授权失败！"); } - return result; } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 6c9ea0e4..35901c3e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -113,17 +113,15 @@ public class SysRoleController { @RequiresPermissions("sys:role:add") @RequestMapping(value = "/add", method = RequestMethod.POST) //@RequiresRoles({"admin"}) - public Result add(@RequestBody SysRole role) { - Result result = new Result(); + public Result add(@RequestBody SysRole role) { try { role.setCreateTime(new Date()); sysRoleService.save(role); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -134,21 +132,19 @@ public class SysRoleController { //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:edit") @RequestMapping(value = "/edit", method = RequestMethod.PUT) - public Result edit(@RequestBody SysRole role) { - Result result = new Result(); + public Result edit(@RequestBody SysRole role) { SysRole sysrole = sysRoleService.getById(role.getId()); if(sysrole==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { role.setUpdateTime(new Date()); boolean ok = sysRoleService.updateById(role); - //TODO 返回false说明什么？ if(ok) { - result.success("修改成功!"); + return Result.OK("修改成功!"); } } - return result; + return Result.OK(); } /** @@ -172,15 +168,13 @@ public class SysRoleController { //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { - result.error500("未选中角色！"); + return Result.error500("未选中角色！"); }else { sysRoleService.deleteBatchRole(ids.split(",")); - result.success("删除角色成功!"); + return Result.OK("删除角色成功!"); } - return result; } /** @@ -191,28 +185,22 @@ public class SysRoleController { @RequiresPermissions("sys:role:list") @RequestMapping(value = "/queryById", method = RequestMethod.GET) public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - SysRole sysrole = sysRoleService.getById(id); - if(sysrole==null) { - result.error500("未找到对应实体"); + SysRole sysRole = sysRoleService.getById(id); + if(sysRole==null) { + return Result.error500("未找到对应实体"); }else { - result.setResult(sysrole); - result.setSuccess(true); + return Result.OK(sysRole); } - return result; } @RequiresPermissions("sys:role:list") @RequestMapping(value = "/queryall", method = RequestMethod.GET) public Result> queryall() { - Result> result = new Result<>(); List list = sysRoleService.list(); if(list==null||list.size()<=0) { - result.error500("未找到角色信息"); + return Result.error500("未找到角色信息"); }else { - result.setResult(list); - result.setSuccess(true); + return Result.OK(list); } - return result; } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java index 1b7a2a47..feb914ce 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java @@ -58,19 +58,18 @@ public class SysTenantController { * @return */ @RequestMapping(value = "/add", method = RequestMethod.POST) - public Result add(@RequestBody SysTenant sysTenant) { - Result result = new Result(); + public Result add(@RequestBody SysTenant sysTenant) { if(sysTenantService.getById(sysTenant.getId())!=null){ - return result.error500("该编号已存在!"); + return Result.error500("该编号已存在!"); } + try { sysTenantService.save(sysTenant); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -79,18 +78,17 @@ public class SysTenantController { * @return */ @RequestMapping(value = "/edit", method = RequestMethod.PUT) - public Result edit(@RequestBody SysTenant tenant) { - Result result = new Result(); + public Result edit(@RequestBody SysTenant tenant) { SysTenant sysTenant = sysTenantService.getById(tenant.getId()); if(sysTenant==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysTenantService.updateById(tenant); if(ok) { - result.success("修改成功!"); + return Result.OK("修改成功!"); } } - return result; + return Result.OK(); } /** @@ -111,9 +109,8 @@ public class SysTenantController { */ @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result<>(); if(oConvertUtils.isEmpty(ids)) { - result.error500("未选中租户！"); + return Result.error500("未选中租户！"); }else { String[] ls = ids.split(","); // 过滤掉已被引用的租户 @@ -124,18 +121,18 @@ public class SysTenantController { idList.add(id); } } + if (idList.size() > 0) { sysTenantService.removeByIds(idList); if (ls.length == idList.size()) { - result.success("删除成功！"); + return Result.OK("删除成功！"); } else { - result.success("部分删除成功！（被引用的租户无法删除）"); + return Result.OK("部分删除成功！（被引用的租户无法删除）"); } }else { - result.error500("选择的租户都已被引用，无法删除！"); + return Result.error500("选择的租户都已被引用，无法删除！"); } } - return result; } /** @@ -145,15 +142,12 @@ public class SysTenantController { */ @RequestMapping(value = "/queryById", method = RequestMethod.GET) public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); SysTenant sysTenant = sysTenantService.getById(id); if(sysTenant==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { - result.setResult(sysTenant); - result.setSuccess(true); + return Result.OK(sysTenant); } - return result; } @@ -163,7 +157,6 @@ public class SysTenantController { */ @RequestMapping(value = "/queryList", method = RequestMethod.GET) public Result> queryList(@RequestParam(name="ids",required=false) String ids) { - Result> result = new Result>(); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysTenant::getStatus, 1); if(oConvertUtils.isNotEmpty(ids)){ @@ -171,8 +164,6 @@ public class SysTenantController { } //此处查询忽略时间条件 List ls = sysTenantService.list(query); - result.setSuccess(true); - result.setResult(ls); - return result; + return Result.OK(ls); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java index 6b061de7..eef39e9d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java @@ -90,16 +90,14 @@ public class SysUserAgentController { * @return */ @PostMapping(value = "/add") - public Result add(@RequestBody SysUserAgent sysUserAgent) { - Result result = new Result(); + public Result add(@RequestBody SysUserAgent sysUserAgent) { try { sysUserAgentService.save(sysUserAgent); - result.success("代理人设置成功！"); + return Result.OK("代理人设置成功！"); } catch (Exception e) { log.error(e.getMessage(),e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } /** @@ -108,20 +106,18 @@ public class SysUserAgentController { * @return */ @PutMapping(value = "/edit") - public Result edit(@RequestBody SysUserAgent sysUserAgent) { - Result result = new Result(); + public Result edit(@RequestBody SysUserAgent sysUserAgent) { SysUserAgent sysUserAgentEntity = sysUserAgentService.getById(sysUserAgent.getId()); if(sysUserAgentEntity==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysUserAgentService.updateById(sysUserAgent); - //TODO 返回false说明什么？ if(ok) { - result.success("代理人设置成功!"); + return Result.OK("代理人设置成功!"); } } - - return result; + + return Result.OK(); } /** @@ -130,19 +126,17 @@ public class SysUserAgentController { * @return */ @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); + public Result delete(@RequestParam(name="id",required=true) String id) { SysUserAgent sysUserAgent = sysUserAgentService.getById(id); if(sysUserAgent==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { boolean ok = sysUserAgentService.removeById(id); if(ok) { - result.success("删除成功!"); + return Result.OK("删除成功!"); } } - - return result; + return Result.OK(); } /** @@ -151,15 +145,13 @@ public class SysUserAgentController { * @return */ @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); + return Result.error500("参数不识别！"); }else { this.sysUserAgentService.removeByIds(Arrays.asList(ids.split(","))); - result.success("删除成功!"); + return Result.OK("删除成功!"); } - return result; } /** @@ -169,15 +161,12 @@ public class SysUserAgentController { */ @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); SysUserAgent sysUserAgent = sysUserAgentService.getById(id); if(sysUserAgent==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { - result.setResult(sysUserAgent); - result.setSuccess(true); + return Result.OK(sysUserAgent); } - return result; } /** @@ -187,17 +176,14 @@ public class SysUserAgentController { */ @GetMapping(value = "/queryByUserName") public Result queryByUserName(@RequestParam(name="userName",required=true) String userName) { - Result result = new Result(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(SysUserAgent::getUserName, userName); SysUserAgent sysUserAgent = sysUserAgentService.getOne(queryWrapper); if(sysUserAgent==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { - result.setResult(sysUserAgent); - result.setSuccess(true); + return Result.OK(sysUserAgent); } - return result; } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index da27e978..a7ca9060 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -135,8 +135,7 @@ public class SysUserController { @RequiresPermissions("user:add") @RequestMapping(value = "/add", method = RequestMethod.POST) - public Result add(@RequestBody JSONObject jsonObject) { - Result result = new Result(); + public Result add(@RequestBody JSONObject jsonObject) { try { String selectedRoles = jsonObject.getString("selectedroles"); String selectedDeparts = jsonObject.getString("selecteddeparts"); @@ -172,12 +171,11 @@ public class SysUserController { // 保存用户走一个service 保证事务 sysUserService.saveUser(user, selectedRoles, selectedDeparts); - result.success("添加成功！"); + return Result.OK("添加成功！"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } @RequiresPermissions("user:edit") @@ -187,12 +185,11 @@ public class SysUserController { String roles = jsonObject.getString("selectedroles"); String departs = jsonObject.getString("selecteddeparts"); String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey)); - Result result = new Result(); try { SysUser sysUser = sysUserService.getById(jsonObject.getString("id")); baseCommonService.addLog("编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2); if(sysUser==null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); }else { SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); String email = null; @@ -219,13 +216,12 @@ public class SysUserController { user.setPassword(sysUser.getPassword()); // 修改用户走一个service 保证事务 sysUserService.editUser(user, roles, departs); - result.success("修改成功!"); + return Result.OK("修改成功!"); } } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error500("操作失败"); } - return result; } @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @@ -245,8 +241,7 @@ public class SysUserController { @RequiresPermissions("sys:user:list") @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) - public Result frozenBatch(@RequestBody JSONObject jsonObject) { - Result result = new Result(); + public Result frozenBatch(@RequestBody JSONObject jsonObject) { try { String ids = jsonObject.getString("ids"); String status = jsonObject.getString("status"); @@ -259,41 +254,35 @@ public class SysUserController { } } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"+e.getMessage()); + return Result.error500("操作失败"+e.getMessage()); } - result.success("操作成功!"); - return result; + return Result.OK("操作成功!"); } @RequiresPermissions("sys:user:list") @RequestMapping(value = "/queryById", method = RequestMethod.GET) public Result queryById(@RequestParam(name = "id", required = true) String id) { - Result result = new Result(); SysUser sysUser = sysUserService.getById(id); if (sysUser == null) { - result.error500("未找到对应实体"); + return Result.error500("未找到对应实体"); } else { - result.setResult(sysUser); - result.setSuccess(true); + return Result.OK(sysUser); } - return result; } + @RequiresPermissions("sys:user:list") @RequestMapping(value = "/queryUserRole", method = RequestMethod.GET) public Result> queryUserRole(@RequestParam(name = "userid", required = true) String userid) { - Result> result = new Result<>(); List list = new ArrayList(); List userRole = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, userid)); if (userRole == null || userRole.size() <= 0) { - result.error500("未找到用户相关角色信息"); + return Result.error500("未找到用户相关角色信息"); } else { for (SysUserRole sysUserRole : userRole) { list.add(sysUserRole.getRoleId()); } - result.setSuccess(true); - result.setResult(list); + return Result.OK(list); } - return result; } @@ -398,7 +387,6 @@ public class SysUserController { @RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET) public Result> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) { Result> result = new Result<>(); - //List userList = sysUserDepartService.queryUserByDepId(id); SysDepart sysDepart = sysDepartService.getById(id); List userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname); @@ -409,7 +397,6 @@ public class SysUserController { if(userIds!=null && userIds.size()>0){ Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); userList.forEach(item->{ - //TODO 临时借用这个字段用于页面展示 item.setOrgCodeTxt(useDepNames.get(item.getId())); }); } @@ -658,20 +645,17 @@ public class SysUserController { * @return */ @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE) - public Result deleteUserRole(@RequestParam(name="roleId") String roleId, - @RequestParam(name="userId",required=true) String userId - ) { - Result result = new Result(); - try { + public Result deleteUserRole(@RequestParam(name="roleId") String roleId, + @RequestParam(name="userId",required=true) String userId) { + try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("role_id", roleId).eq("user_id",userId); sysUserRoleService.remove(queryWrapper); - result.success("删除成功!"); + return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - result.error500("删除失败！"); + return Result.error500("删除失败！"); } - return result; } /** @@ -684,17 +668,15 @@ public class SysUserController { public Result deleteUserRoleBatch( @RequestParam(name="roleId") String roleId, @RequestParam(name="userIds",required=true) String userIds) { - Result result = new Result(); try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("role_id", roleId).in("user_id",Arrays.asList(userIds.split(","))); sysUserRoleService.remove(queryWrapper); - result.success("删除成功!"); + return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - result.error500("删除失败！"); + return Result.error500("删除失败！"); } - return result; } /** @@ -792,10 +774,8 @@ public class SysUserController { * 删除指定机构的用户关系 */ @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE) - public Result deleteUserInDepart(@RequestParam(name="depId") String depId, - @RequestParam(name="userId",required=true) String userId - ) { - Result result = new Result(); + public Result deleteUserInDepart(@RequestParam(name="depId") String depId, + @RequestParam(name="userId",required=true) String userId) { try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).eq("user_id",userId); @@ -808,25 +788,23 @@ public class SysUserController { query.eq("user_id",userId).in("drole_id",roleIds); departRoleUserService.remove(query); } - result.success("删除成功!"); + return Result.OK("删除成功!"); }else{ - result.error500("当前选中部门与用户无关联关系!"); + return Result.error500("当前选中部门与用户无关联关系!"); } }catch(Exception e) { log.error(e.getMessage(), e); - result.error500("删除失败！"); + return Result.error500("删除失败！"); } - return result; } /** * 批量删除指定机构的用户关系 */ @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE) - public Result deleteUserInDepartBatch( + public Result deleteUserInDepartBatch( @RequestParam(name="depId") String depId, @RequestParam(name="userIds",required=true) String userIds) { - Result result = new Result(); try { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(","))); @@ -834,12 +812,11 @@ public class SysUserController { if(b){ departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId); } - result.success("删除成功!"); + return Result.OK("删除成功!"); }catch(Exception e) { log.error(e.getMessage(), e); - result.error500("删除失败！"); + return Result.error500("删除失败！"); } - return result; } /** @@ -849,20 +826,17 @@ public class SysUserController { @RequiresPermissions("sys:user:list") @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET) public Result> getCurrentUserDeparts() { - Result> result = new Result>(); try { LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal(); List list = this.sysDepartService.queryUserDeparts(sysUser.getId()); Map map = new HashMap(); map.put("list", list); map.put("orgCode", sysUser.getOrgCode()); - result.setSuccess(true); - result.setResult(map); + return Result.OK(map); }catch(Exception e) { log.error(e.getMessage(), e); - result.error500("查询失败！"); + return Result.error500("查询失败！"); } - return result; } @@ -938,7 +912,7 @@ public class SysUserController { user.setDelFlag(CommonConstant.DEL_FLAG_0); user.setActivitiSync(CommonConstant.ACT_SYNC_0); sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test - result.success("注册成功"); + result.setMessage("注册成功"); } catch (Exception e) { result.error500("注册失败"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java index f22b5019..2044e431 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserOnlineController.java @@ -120,7 +120,7 @@ public class SysUserOnlineController { redisUtil.del(String.format("%s::%s", CacheConstant.SYS_USERS_CACHE, sysUser.getUsername())); //调用shiro的logout SecurityUtils.getSubject().logout(); - return Result.ok("退出登录成功！"); + return Result.OK("退出登录成功！"); }else { return Result.error("Token无效!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index bbfd495a..3c6e36ff 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -206,7 +206,7 @@ public class LoginServiceImpl implements ILoginService { //update-end--Author:zhangweijian Date:20190428 for：传入开始时间，结束时间参数 obj.put("todayIp", todayIp); result.setResult(obj); - result.success("登录成功"); + result.setMessage("登录成功"); return result; } @@ -511,7 +511,7 @@ public class LoginServiceImpl implements ILoginService { obj.put("userInfo", sysUser); obj.put("sysAllDictItems", sysDictService.queryAllDictItems()); result.setResult(obj); - result.success("登录成功"); + result.setMessage("登录成功"); return result; } } diff --git a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java index 8c403839..182fc42c 100644 --- a/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java +++ b/jero-boot/jero-boot-single-startup/src/main/java/com/jero/JeroSystemSingleApplication.java @@ -34,9 +34,9 @@ public class JeroSystemSingleApplication extends SpringBootServletInitializer { String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); log.info("\n----------------------------------------------------------\n\t" + "Application jero-boot is running! Access URLs:\n\t" + - "Local: \t\thttp://localhost:" + port + path + "/\n\t" + - "External: \thttp://" + ip + ":" + port + path + "/\n\t" + - "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + + "Local: \t\thttp://localhost:" + port + path + "\n\t" + + "External: \thttp://" + ip + ":" + port + path + "\n\t" + + "Swagger文档: \thttp://" + ip + ":" + port + path + "doc.html\n" + "----------------------------------------------------------"); } diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/templates/announcement/showContent.ftl b/jero-boot/jero-boot-single-startup/src/main/resources/templates/announcement/showContent.ftl new file mode 100644 index 00000000..cb9408c5 --- /dev/null +++ b/jero-boot/jero-boot-single-startup/src/main/resources/templates/announcement/showContent.ftl @@ -0,0 +1,135 @@ + + + + + + + 通告详情 + + + +
+

${data.titile}

+
+ <#if data.priority??> + + <#if data.priority == "H"> + 高 + <#elseif data.priority == "M"> + 中 + <#elseif data.priority == "L"> + 低 + <#else > + ${data.priority} + + + + <#if data.sender??> + ${data.sender} + + <#if data.sendTime??> + ${data.sendTime?string('yyyy年MM月dd日')} + +
+
+
+ ${data.msgContent!''} +
+ + \ No newline at end of file diff --git a/jero-web/src/components/jero/JVxeTable/components/cells/JVxeSelectCell.vue b/jero-web/src/components/jero/JVxeTable/components/cells/JVxeSelectCell.vue index a014e451..18ffafc4 100644 --- a/jero-web/src/components/jero/JVxeTable/components/cells/JVxeSelectCell.vue +++ b/jero-web/src/components/jero/JVxeTable/components/cells/JVxeSelectCell.vue @@ -93,7 +93,6 @@ }, methods: { handleChange(value) { - debugger // 处理下级联动 let linkage = this.renderOptions.linkage if (linkage) { diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 98a71bee..187fa3c8 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -70,7 +70,7 @@ const user = { Login({ commit }, userInfo) { return new Promise((resolve, reject) => { login(userInfo).then(response => { - if(response.code =='200'){ + if(response.code =='200'){ const result = response.result const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) @@ -83,10 +83,10 @@ const user = { commit('SET_AVATAR', userInfo.avatar) resolve(response) }else{ - reject(response) + reject(response) } }).catch(error => { - reject(error) + reject(error) }) }) }, diff --git a/jero-web/src/views/user/Login.vue b/jero-web/src/views/user/Login.vue index 950e3f71..ea1fc996 100644 --- a/jero-web/src/views/user/Login.vue +++ b/jero-web/src/views/user/Login.vue @@ -340,7 +340,7 @@ }, cmsFailed(err){ this.$notification[ 'error' ]({ - message: "登录失败", + message: "验证码发送失败", description:err, duration: 4, });