KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】替换全部响应构造器中小写的ok为大写的OK

Browse Source
This commit is contained in:
zer0Black
2021-03-16 11:03:17 +08:00
parent 4da76c251d
commit 4627a3b017
30 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java
+8 -8
View File
@@ -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<JSONObject> 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);
}
/**
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java
+9 -9
View File
@@ -78,7 +78,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap());
Page<JeroOrderMain> page = new Page<JeroOrderMain>(pageNo, pageSize);
IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper);
return Result.ok(pageList);
return Result.OK(pageList);
}
/**
@@ -92,7 +92,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.saveMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
return Result.ok("添加成功！");
return Result.OK("添加成功！");
}
/**
@@ -106,7 +106,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.updateCopyMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
return Result.ok("编辑成功！");
return Result.OK("编辑成功！");
}
/**
@@ -118,7 +118,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
@DeleteMapping(value = "/delete")
public Result<?> 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<JeroOrderMain, IJero
@DeleteMapping(value = "/deleteBatch")
public Result<?> 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<JeroOrderMain, IJero
@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);
}
/**
@@ -154,7 +154,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
@GetMapping(value = "/queryOrderCustomerListByMainId")
public Result<?> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) {
List<JeroOrderCustomer> jeroOrderCustomerList = jeroOrderCustomerService.selectCustomersByMainId(id);
return Result.ok(jeroOrderCustomerList);
return Result.OK(jeroOrderCustomerList);
}
/**
@@ -166,7 +166,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
@GetMapping(value = "/queryOrderTicketListByMainId")
public Result<?> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) {
List<JeroOrderTicket> jeroOrderTicketList = jeroOrderTicketService.selectTicketsByMainId(id);
return Result.ok(jeroOrderTicketList);
return Result.OK(jeroOrderTicketList);
}
/**
@@ -233,7 +233,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
BeanUtils.copyProperties(page, po);
jeroOrderMainService.saveMain(po, page.getJeroOrderCustomerList(), page.getJeroOrderTicketList());
}
return Result.ok("文件导入成功！");
return Result.OK("文件导入成功！");
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("文件导入失败：" + e.getMessage());
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java
+16 -16
View File
@@ -65,7 +65,7 @@ public class JeroOrderTabMainController {
QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap());
Page<JeroOrderMain> page = new Page<JeroOrderMain>(pageNo, pageSize);
IPage<JeroOrderMain> 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<JeroOrderCustomer> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderCustomer, req.getParameterMap());
Page<JeroOrderCustomer> page = new Page<JeroOrderCustomer>(pageNo, pageSize);
IPage<JeroOrderCustomer> pageList = jeroOrderCustomerService.page(page, queryWrapper);
return Result.ok(pageList);
return Result.OK(pageList);
}
/**
@@ -164,7 +164,7 @@ public class JeroOrderTabMainController {
QueryWrapper<JeroOrderTicket> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderTicket, req.getParameterMap());
Page<JeroOrderTicket> page = new Page<JeroOrderTicket>(pageNo, pageSize);
IPage<JeroOrderTicket> 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("批量删除成功!");
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java
+2 -2
View File
@@ -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("文件导入失败！");
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java
+8 -8
View File
@@ -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<JSONObject> 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);
}
/**