diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java index cbe41020..fb5c88fc 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java @@ -127,7 +127,7 @@ public class JeroController> { //1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒 log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); //update-end-author:taoyan date:20190528 for:批量插入数据 - return Result.ok("文件导入成功!数据行数:" + list.size()); + return Result.OK("文件导入成功!数据行数:" + list.size()); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("文件导入失败:" + e.getMessage()); diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java index ca560da1..8a09ad20 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ImportExcelUtil.java @@ -18,7 +18,7 @@ public class ImportExcelUtil { public static Result imporReturnRes(int errorLines,int successLines,List errorMessage) throws IOException { if (errorLines == 0) { - return Result.ok("共" + successLines + "行数据全部导入成功!"); + return Result.OK("共" + successLines + "行数据全部导入成功!"); } else { JSONObject result = new JSONObject(5); int totalCount = successLines + errorLines; @@ -31,7 +31,7 @@ public class ImportExcelUtil { String fileName = fileUrl.substring(lastIndex + 1); result.put("fileUrl", "/sys/common/static/" + fileUrl); result.put("fileName", fileName); - Result res = Result.ok(result); + Result res = Result.OK(result); res.setCode(201); res.setMessage("文件导入成功,但有错误。"); return res; diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java index ef97a13b..9cffd8bf 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java @@ -49,7 +49,7 @@ public class VxeMockController { // 模拟更改数据 this.mockChange(rowData); - return Result.ok(); + return Result.OK(); } /** @@ -73,7 +73,7 @@ public class VxeMockController { // 模拟更改数据 this.mockChange(rowData); - return Result.ok(); + return Result.OK(); } /** @@ -96,7 +96,7 @@ public class VxeMockController { // 模拟更改数据 this.mockChange(rowData); - return Result.ok(); + return Result.OK(); } private void mockChange(JSONObject rowData) { @@ -133,7 +133,7 @@ public class VxeMockController { // 调用 sendMessageToAll 发送给所有在线的用户 VXESocket.sendMessageToAll(message); - return Result.ok(); + return Result.OK(); } /** @@ -146,7 +146,7 @@ public class VxeMockController { System.out.println("即时保存.rowData:" + rowData.toJSONString()); // 延时1.5秒,模拟网慢堵塞真实感 Thread.sleep(500); - return Result.ok(); + return Result.OK(); } /** @@ -166,7 +166,7 @@ public class VxeMockController { System.out.println("即时保存.tableData:" + tableData.toJSONString()); // 延时1.5秒,模拟网慢堵塞真实感 Thread.sleep(1000); - return Result.ok(); + return Result.OK(); } /** @@ -192,7 +192,7 @@ public class VxeMockController { return Result.error("读取数据失败!"); } IPage page = this.queryDataPage(dataList, parentId, pageNo, pageSize); - return Result.ok(page); + return Result.OK(page); } /** @@ -326,7 +326,7 @@ public class VxeMockController { record.put("tug_status", tugStatusMap); } page.setRecords(records); - return Result.ok(page); + return Result.OK(page); } /** diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java index aa4dc9d5..ef16040f 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java @@ -78,7 +78,7 @@ public class JeroOrderMainController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = jeroOrderMainService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -92,7 +92,7 @@ public class JeroOrderMainController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { jeroOrderMainService.delMain(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -130,7 +130,7 @@ public class JeroOrderMainController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.jeroOrderMainService.delBatchMain(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -142,7 +142,7 @@ public class JeroOrderMainController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id); - return Result.ok(jeroOrderMain); + return Result.OK(jeroOrderMain); } /** @@ -154,7 +154,7 @@ public class JeroOrderMainController extends JeroController queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) { List jeroOrderCustomerList = jeroOrderCustomerService.selectCustomersByMainId(id); - return Result.ok(jeroOrderCustomerList); + return Result.OK(jeroOrderCustomerList); } /** @@ -166,7 +166,7 @@ public class JeroOrderMainController extends JeroController queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) { List jeroOrderTicketList = jeroOrderTicketService.selectTicketsByMainId(id); - return Result.ok(jeroOrderTicketList); + return Result.OK(jeroOrderTicketList); } /** @@ -233,7 +233,7 @@ public class JeroOrderMainController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = jeroOrderMainService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -79,7 +79,7 @@ public class JeroOrderTabMainController { JeroOrderMain jeroOrderMain = new JeroOrderMain(); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); jeroOrderMainService.save(jeroOrderMain); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -93,7 +93,7 @@ public class JeroOrderTabMainController { JeroOrderMain jeroOrderMain = new JeroOrderMain(); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); jeroOrderMainService.updateById(jeroOrderMain); - return Result.ok("编辑成功!"); + return Result.OK("编辑成功!"); } /** @@ -105,7 +105,7 @@ public class JeroOrderTabMainController { @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name = "id", required = true) String id) { jeroOrderMainService.delMain(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -117,7 +117,7 @@ public class JeroOrderTabMainController { @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.jeroOrderMainService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -129,7 +129,7 @@ public class JeroOrderTabMainController { @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id); - return Result.ok(jeroOrderMain); + return Result.OK(jeroOrderMain); } @@ -147,7 +147,7 @@ public class JeroOrderTabMainController { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderCustomer, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = jeroOrderCustomerService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -164,7 +164,7 @@ public class JeroOrderTabMainController { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderTicket, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = jeroOrderTicketService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -176,7 +176,7 @@ public class JeroOrderTabMainController { @PostMapping(value = "/addCustomer") public Result addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { jeroOrderCustomerService.save(jeroOrderCustomer); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -188,7 +188,7 @@ public class JeroOrderTabMainController { @PutMapping("/editCustomer") public Result editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { jeroOrderCustomerService.updateById(jeroOrderCustomer); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -200,7 +200,7 @@ public class JeroOrderTabMainController { @DeleteMapping(value = "/deleteCustomer") public Result deleteCustomer(@RequestParam(name = "id", required = true) String id) { jeroOrderCustomerService.removeById(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -212,7 +212,7 @@ public class JeroOrderTabMainController { @DeleteMapping(value = "/deleteBatchCustomer") public Result deleteBatchCustomer(@RequestParam(name = "ids", required = true) String ids) { this.jeroOrderCustomerService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -224,7 +224,7 @@ public class JeroOrderTabMainController { @PostMapping(value = "/addTicket") public Result addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { jeroOrderTicketService.save(jeroOrderTicket); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -236,7 +236,7 @@ public class JeroOrderTabMainController { @PutMapping("/editTicket") public Result editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { jeroOrderTicketService.updateById(jeroOrderTicket); - return Result.ok("编辑成功!"); + return Result.OK("编辑成功!"); } /** @@ -248,7 +248,7 @@ public class JeroOrderTabMainController { @DeleteMapping(value = "/deleteTicket") public Result deleteTicket(@RequestParam(name = "id", required = true) String id) { jeroOrderTicketService.removeById(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -260,7 +260,7 @@ public class JeroOrderTabMainController { @DeleteMapping(value = "/deleteBatchTicket") public Result deleteBatchTicket(@RequestParam(name = "ids", required = true) String ids) { this.jeroOrderTicketService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } } \ No newline at end of file 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 0d56e297..22efc60d 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 @@ -226,7 +226,7 @@ public class JoaDemoController { for (JoaDemo joaDemoExcel : listJoaDemos) { joaDemoService.save(joaDemoExcel); } - return Result.ok("文件导入成功!数据行数:" + listJoaDemos.size()); + return Result.OK("文件导入成功!数据行数:" + listJoaDemos.size()); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("文件导入失败:"+e.getMessage()); @@ -238,7 +238,7 @@ public class JoaDemoController { } } } - return Result.ok("文件导入失败!"); + return Result.OK("文件导入失败!"); } } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java index 3a595c22..38db4787 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java @@ -49,7 +49,7 @@ public class DlMockController { // 模拟更改数据 this.mockChange(rowData); - return Result.ok(); + return Result.OK(); } /** @@ -73,7 +73,7 @@ public class DlMockController { // 模拟更改数据 this.mockChange(rowData); - return Result.ok(); + return Result.OK(); } /** @@ -96,7 +96,7 @@ public class DlMockController { // 模拟更改数据 this.mockChange(rowData); - return Result.ok(); + return Result.OK(); } private void mockChange(JSONObject rowData) { @@ -132,7 +132,7 @@ public class DlMockController { // 调用 sendMessageToAll 发送给所有在线的用户 VXESocket.sendMessageToAll(message); - return Result.ok(); + return Result.OK(); } /** @@ -145,7 +145,7 @@ public class DlMockController { System.out.println("即时保存.rowData:" + rowData.toJSONString()); // 延时1.5秒,模拟网慢堵塞真实感 Thread.sleep(500); - return Result.ok(); + return Result.OK(); } /** @@ -165,7 +165,7 @@ public class DlMockController { System.out.println("即时保存.tableData:" + tableData.toJSONString()); // 延时1.5秒,模拟网慢堵塞真实感 Thread.sleep(1000); - return Result.ok(); + return Result.OK(); } /** @@ -191,7 +191,7 @@ public class DlMockController { return Result.error("读取数据失败!"); } IPage page = this.queryDataPage(dataList, parentId, pageNo, pageSize); - return Result.ok(page); + return Result.OK(page); } /** @@ -325,7 +325,7 @@ public class DlMockController { record.put("tug_status", tugStatusMap); } page.setRecords(records); - return Result.ok(page); + return Result.OK(page); } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java index 6266c915..b5d71413 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java @@ -55,7 +55,7 @@ public class SysMessageController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = sysMessageService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -67,7 +67,7 @@ public class SysMessageController extends JeroController add(@RequestBody SysMessage sysMessage) { sysMessageService.save(sysMessage); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -79,7 +79,7 @@ public class SysMessageController extends JeroController edit(@RequestBody SysMessage sysMessage) { sysMessageService.updateById(sysMessage); - return Result.ok("修改成功!"); + return Result.OK("修改成功!"); } @@ -92,7 +92,7 @@ public class SysMessageController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { sysMessageService.removeById(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -105,7 +105,7 @@ public class SysMessageController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.sysMessageService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -117,7 +117,7 @@ public class SysMessageController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { SysMessage sysMessage = sysMessageService.getById(id); - return Result.ok(sysMessage); + return Result.OK(sysMessage); } /** 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 1d84883f..10096978 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 @@ -61,7 +61,7 @@ public class SysMessageTemplateController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sysMessageTemplate, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = sysMessageTemplateService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -73,7 +73,7 @@ public class SysMessageTemplateController extends JeroController add(@RequestBody SysMessageTemplate sysMessageTemplate) { sysMessageTemplateService.save(sysMessageTemplate); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -85,7 +85,7 @@ public class SysMessageTemplateController extends JeroController edit(@RequestBody SysMessageTemplate sysMessageTemplate) { sysMessageTemplateService.updateById(sysMessageTemplate); - return Result.ok("更新成功!"); + return Result.OK("更新成功!"); } /** @@ -97,7 +97,7 @@ public class SysMessageTemplateController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { sysMessageTemplateService.removeById(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -109,7 +109,7 @@ public class SysMessageTemplateController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -121,7 +121,7 @@ public class SysMessageTemplateController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { SysMessageTemplate sysMessageTemplate = sysMessageTemplateService.getById(id); - return Result.ok(sysMessageTemplate); + return Result.OK(sysMessageTemplate); } /** 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 b1b33adc..10e79edd 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 @@ -36,7 +36,7 @@ public class ActuatorRedisController { public Result getRedisInfo() throws Exception { List infoList = this.redisService.getRedisInfo(); log.info(infoList.toString()); - return Result.ok(infoList); + return Result.OK(infoList); } @GetMapping("/keysSize") 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 12ca67c5..226267d9 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 @@ -76,7 +76,7 @@ public class QuartzJobController { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = quartzJobService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } @@ -94,7 +94,7 @@ public class QuartzJobController { return Result.error("该定时任务类名已存在"); } quartzJobService.saveAndScheduleJob(quartzJob); - return Result.ok("创建定时任务成功"); + return Result.OK("创建定时任务成功"); } /** @@ -112,7 +112,7 @@ public class QuartzJobController { log.error(e.getMessage(),e); return Result.error("更新定时任务失败!"); } - return Result.ok("更新定时任务成功!"); + return Result.OK("更新定时任务成功!"); } /** @@ -129,7 +129,7 @@ public class QuartzJobController { return Result.error("未找到对应实体"); } quartzJobService.deleteAndStopJob(quartzJob); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } @@ -149,7 +149,7 @@ public class QuartzJobController { QuartzJob job = quartzJobService.getById(id); quartzJobService.deleteAndStopJob(job); } - return Result.ok("删除定时任务成功!"); + return Result.OK("删除定时任务成功!"); } /** @@ -168,7 +168,7 @@ public class QuartzJobController { return Result.error("定时任务不存在!"); } quartzJobService.pause(job); - return Result.ok("暂停定时任务成功"); + return Result.OK("暂停定时任务成功"); } /** @@ -187,7 +187,7 @@ public class QuartzJobController { } quartzJobService.resumeJob(job); //scheduler.resumeJob(JobKey.jobKey(job.getJobClassName().trim())); - return Result.ok("恢复定时任务成功"); + return Result.OK("恢复定时任务成功"); } /** @@ -199,7 +199,7 @@ public class QuartzJobController { @RequestMapping(value = "/queryById", method = RequestMethod.GET) public Result queryById(@RequestParam(name = "id", required = true) String id) { QuartzJob quartzJob = quartzJobService.getById(id); - return Result.ok(quartzJob); + return Result.OK(quartzJob); } /** @@ -281,6 +281,6 @@ public class QuartzJobController { log.info("定时任务 立即执行失败>>"+e.getMessage()); return Result.error("执行失败!"); } - 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 f8eef5ea..0b9d1df3 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 @@ -56,7 +56,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/LoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 101770b0..60dc6d34 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -145,7 +145,7 @@ public class LoginController { 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无效!"); } @@ -502,7 +502,7 @@ public class LoginController { if(checkCode==null || !checkCode.equals(lowerCaseCaptcha)) { return Result.error("验证码错误"); } - return Result.ok(); + return Result.OK(); } } \ No newline at end of file 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 7c020444..2af00cd3 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 @@ -371,7 +371,7 @@ public class SysAnnouncementController { } sysAnnouncementService.save(sysAnnouncementExcel); } - return Result.ok("文件导入成功!数据行数:" + listSysAnnouncements.size()); + return Result.OK("文件导入成功!数据行数:" + listSysAnnouncements.size()); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("文件导入失败!"); 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 d5dcaba7..4ba0c25a 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 @@ -244,7 +244,7 @@ public class SysCategoryController { } sysCategoryService.save(sysCategoryExcel); } - return Result.ok("文件导入成功!数据行数:" + listSysCategorys.size()); + return Result.OK("文件导入成功!数据行数:" + listSysCategorys.size()); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("文件导入失败:"+e.getMessage()); @@ -354,11 +354,11 @@ public class SysCategoryController { return Result.error("错误,类型编码为空!"); } if(oConvertUtils.isEmpty(pid)){ - return Result.ok(); + return Result.OK(); } SysCategory parent = this.sysCategoryService.getById(pid); if(code.startsWith(parent.getCode())){ - return Result.ok(); + return Result.OK(); }else{ return Result.error("编码不符合规范,须以\""+parent.getCode()+"\"开头!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java index 96d690c7..225b5426 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java @@ -59,7 +59,7 @@ public class SysCheckRuleController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sysCheckRule, request.getParameterMap()); Page page = new Page<>(pageNo, pageSize); IPage pageList = sysCheckRuleService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } @@ -82,7 +82,7 @@ public class SysCheckRuleController extends JeroController r = Result.error(errorResult.getString("message")); r.setResult(errorResult); @@ -101,7 +101,7 @@ public class SysCheckRuleController extends JeroController queryById(@RequestParam(name = "id") String id) { SysDataSource sysDataSource = sysDataSourceService.getById(id); - return Result.ok(sysDataSource); + return Result.OK(sysDataSource); } /** 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 f5102b9a..66c9bcce 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 @@ -73,7 +73,7 @@ public class SysDepartPermissionController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sysDepartPermission, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = sysDepartPermissionService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -86,7 +86,7 @@ public class SysDepartPermissionController extends JeroController add(@RequestBody SysDepartPermission sysDepartPermission) { sysDepartPermissionService.save(sysDepartPermission); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -99,7 +99,7 @@ public class SysDepartPermissionController extends JeroController edit(@RequestBody SysDepartPermission sysDepartPermission) { sysDepartPermissionService.updateById(sysDepartPermission); - return Result.ok("编辑成功!"); + return Result.OK("编辑成功!"); } /** @@ -112,7 +112,7 @@ public class SysDepartPermissionController extends JeroController delete(@RequestParam(name="id",required=true) String id) { sysDepartPermissionService.removeById(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -125,7 +125,7 @@ public class SysDepartPermissionController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -138,7 +138,7 @@ public class SysDepartPermissionController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { SysDepartPermission sysDepartPermission = sysDepartPermissionService.getById(id); - return Result.ok(sysDepartPermission); + return Result.OK(sysDepartPermission); } /** @@ -187,7 +187,7 @@ public class SysDepartPermissionController extends JeroController pageList = sysDepartRoleService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -101,7 +101,7 @@ public class SysDepartRoleController extends JeroController add(@RequestBody SysDepartRole sysDepartRole) { sysDepartRoleService.save(sysDepartRole); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -115,7 +115,7 @@ public class SysDepartRoleController extends JeroController edit(@RequestBody SysDepartRole sysDepartRole) { sysDepartRoleService.updateById(sysDepartRole); - return Result.ok("编辑成功!"); + return Result.OK("编辑成功!"); } /** @@ -130,7 +130,7 @@ public class SysDepartRoleController extends JeroController delete(@RequestParam(name="id",required=true) String id) { sysDepartRoleService.removeById(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -145,7 +145,7 @@ public class SysDepartRoleController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.sysDepartRoleService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -158,7 +158,7 @@ public class SysDepartRoleController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); - return Result.ok(sysDepartRole); + return Result.OK(sysDepartRole); } /** @@ -188,7 +188,7 @@ public class SysDepartRoleController extends JeroController queryAllDictItems(HttpServletRequest request) { Map> res = new HashMap>(); res = sysDictService.queryAllDictItems(); - return Result.ok(res); + return Result.OK(res); } /** @@ -539,7 +539,7 @@ public class SysDictController { public Result deletePhysic(@PathVariable String id) { try { sysDictService.deleteOneDictPhysically(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } catch (Exception e) { e.printStackTrace(); return Result.error("删除失败!"); @@ -555,7 +555,7 @@ public class SysDictController { public Result back(@PathVariable String id) { try { sysDictService.updateDictDelFlag(0,id); - return Result.ok("操作成功!"); + return Result.OK("操作成功!"); } catch (Exception e) { e.printStackTrace(); return Result.error("操作失败!"); 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 92513ad1..50e66cc3 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 @@ -172,7 +172,7 @@ public class SysDictItemController { num = sysDictItemService.count(queryWrapper); if (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/SysFillRuleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java index 4341e544..b037c0ea 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java @@ -56,7 +56,7 @@ public class SysFillRuleController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(sysFillRule, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); IPage pageList = sysFillRuleService.page(page, queryWrapper); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -68,7 +68,7 @@ public class SysFillRuleController extends JeroController add(@RequestBody SysFillRule sysFillRule) { sysFillRuleService.save(sysFillRule); - return Result.ok("添加成功!"); + return Result.OK("添加成功!"); } /** @@ -96,7 +96,7 @@ public class SysFillRuleController extends JeroController edit(@RequestBody SysFillRule sysFillRule) { sysFillRuleService.updateById(sysFillRule); - return Result.ok("编辑成功!"); + return Result.OK("编辑成功!"); } /** @@ -110,7 +110,7 @@ public class SysFillRuleController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { sysFillRuleService.removeById(id); - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** @@ -124,7 +124,7 @@ public class SysFillRuleController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(","))); - return Result.ok("批量删除成功!"); + return Result.OK("批量删除成功!"); } /** @@ -138,7 +138,7 @@ public class SysFillRuleController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { SysFillRule sysFillRule = sysFillRuleService.getById(id); - return Result.ok(sysFillRule); + return Result.OK(sysFillRule); } /** @@ -174,7 +174,7 @@ public class SysFillRuleController extends JeroController updateAll(@RequestBody JSONObject json) { sysGatewayRouteService.updateAll(json); - return Result.ok("操作成功!"); + return Result.OK("操作成功!"); } @GetMapping(value = "/list") @@ -51,13 +51,13 @@ public class SysGatewayRouteController extends JeroController clearRedis() { sysGatewayRouteService.clearRedis(); - return Result.ok("清除成功!"); + return Result.OK("清除成功!"); } /** @@ -70,7 +70,7 @@ public class SysGatewayRouteController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { sysGatewayRouteService.deleteById(id); - return Result.ok("删除路由成功"); + return Result.OK("删除路由成功"); } } 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 f99bd006..24099ee2 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 @@ -163,7 +163,7 @@ public class SysPermissionController { listMap.put(pid, mapList); } } - return Result.ok(listMap); + return Result.OK(listMap); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("批量查询子菜单失败:" + e.getMessage()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java index 6c069e70..cc1657c5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPositionController.java @@ -140,7 +140,7 @@ public class SysPositionController { log.error("删除失败", e.getMessage()); return Result.error("删除失败!"); } - return Result.ok("删除成功!"); + return Result.OK("删除成功!"); } /** 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 2e77747d..8aa54041 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 @@ -156,7 +156,7 @@ public class SysRoleController { @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result delete(@RequestParam(name="id",required=true) String id) { sysRoleService.deleteRole(id); - return Result.ok("删除角色成功"); + return Result.OK("删除角色成功"); } /** @@ -322,7 +322,7 @@ public class SysRoleController { map.put("drChecked", drChecked.endsWith(",")?drChecked.substring(0, drChecked.length()-1):drChecked); } } - return Result.ok(map); + return Result.OK(map); //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key } } @@ -351,7 +351,7 @@ public class SysRoleController { log.error("SysRoleController.saveDatarule()发生异常:" + e.getMessage(),e); return Result.error("保存失败"); } - return Result.ok("保存成功!"); + return Result.OK("保存成功!"); } 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 e56a3b67..012338af 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 @@ -100,7 +100,7 @@ public class SysTenantController { @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result delete(@RequestParam(name="id",required=true) String id) { sysTenantService.removeById(id); - return Result.ok("删除成功"); + return Result.OK("删除成功"); } /** 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 96ff261e..3fb3c054 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 @@ -246,7 +246,7 @@ public class SysUserAgentController { for (SysUserAgent sysUserAgentExcel : listSysUserAgents) { sysUserAgentService.save(sysUserAgentExcel); } - return Result.ok("文件导入成功!数据行数:" + listSysUserAgents.size()); + return Result.OK("文件导入成功!数据行数:" + listSysUserAgents.size()); } catch (Exception e) { log.error(e.getMessage(),e); return Result.error("文件导入失败!"); 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 8d946cf8..78cfb1fc 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 @@ -192,7 +192,7 @@ public class SysUserController { public Result delete(@RequestParam(name="id",required=true) String id) { baseCommonService.addLog("删除用户,id: " +id ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteUser(id); - return Result.ok("删除用户成功"); + return Result.OK("删除用户成功"); } /** @@ -203,7 +203,7 @@ public class SysUserController { public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { baseCommonService.addLog("批量删除用户, ids: " +ids ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteBatchUsers(ids); - return Result.ok("批量删除用户成功"); + return Result.OK("批量删除用户成功"); } /** @@ -685,7 +685,7 @@ public class SysUserController { SysUser userParams ) { IPage pageList = sysUserService.queryUserByOrgCode(orgCode, userParams, new Page(pageNo, pageSize)); - return Result.ok(pageList); + return Result.OK(pageList); } /** @@ -731,7 +731,7 @@ public class SysUserController { IPage result = new Page<>(pageNo, pageSize, pageList.getTotal()); result.setRecords(resultJson.toJavaList(JSONObject.class)); - return Result.ok(result); + return Result.OK(result); } /** @@ -1058,7 +1058,7 @@ public class SysUserController { log.debug(" ------ 通过令牌获取部分用户信息,已获取的用户信息: " + map); - return Result.ok(map); + return Result.OK(map); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error(500, "查询失败:" + e.getMessage()); @@ -1096,7 +1096,7 @@ public class SysUserController { } Page page = new Page<>(pageNo, pageSize); IPage res = this.sysUserService.page(page, query); - return Result.ok(res); + return Result.OK(res); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error(500, "查询失败:" + e.getMessage()); @@ -1120,7 +1120,7 @@ public class SysUserController { Map useDepNames = sysUserService.getDepNamesByUserIds(userIds); logicDeletedUserList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId()))); } - return Result.ok(logicDeletedUserList); + return Result.OK(logicDeletedUserList); } /** @@ -1138,7 +1138,7 @@ public class SysUserController { updateUser.setUpdateTime(new Date()); sysUserService.revertLogicDeleted(Arrays.asList(userIds.split(",")), updateUser); } - return Result.ok("还原成功"); + return Result.OK("还原成功"); } /** @@ -1153,7 +1153,7 @@ public class SysUserController { if (StringUtils.isNotBlank(userIds)) { sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(","))); } - return Result.ok("删除成功"); + return Result.OK("删除成功"); } @@ -1258,7 +1258,7 @@ public class SysUserController { map.put("children",childrenUser); } } - return Result.ok(map); + return Result.OK(map); } /** * 移动端查询部门用户信息 @@ -1337,6 +1337,6 @@ public class SysUserController { } user.setPhone(phone); sysUserService.updateById(user); - return Result.ok("手机号设置成功!"); + return Result.OK("手机号设置成功!"); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index f5282542..18c1da9b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -79,7 +79,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } String password = PasswordUtil.encrypt(username, newpassword, user.getSalt()); this.userMapper.update(new SysUser().setPassword(password), new LambdaQueryWrapper().eq(SysUser::getId, user.getId())); - return Result.ok("密码重置成功!"); + return Result.OK("密码重置成功!"); } @Override @@ -91,7 +91,7 @@ public class SysUserServiceImpl extends ServiceImpl impl String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt); sysUser.setPassword(passwordEncode); this.userMapper.updateById(sysUser); - return Result.ok("密码修改成功!"); + return Result.OK("密码修改成功!"); } @Override