JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】返回对象与属性重名修改

Browse Source
This commit is contained in:
梁琦涛
2023-04-03 15:26:32 +08:00
parent 592399e405
commit a581579eab
85 changed files with 1601 additions and 1618 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/cloud/provider/JcloudDemoProvider.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.modules.demo.cloud.provider;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import com.jero.modules.demo.cloud.service.JcloudDemoService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +20,7 @@ public class JcloudDemoProvider {
private JcloudDemoService jcloudDemoService;
@GetMapping("/getMessage")
public Result<String> getMessage(@RequestParam String name) {
public Results<String> getMessage(@RequestParam String name) {
return jcloudDemoService.getMessage(name);
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/cloud/service/JcloudDemoService.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.jero.modules.demo.cloud.service;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
public interface JcloudDemoService {
Result<String> getMessage(String name);
Results<String> getMessage(String name);
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java
+3 -3
View File
@@ -1,13 +1,13 @@
package com.jero.modules.demo.cloud.service.impl;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import com.jero.modules.demo.cloud.service.JcloudDemoService;
import org.springframework.stereotype.Service;
@Service
public class JcloudDemoServiceImpl implements JcloudDemoService {
@Override
public Result<String> getMessage(String name) {
return Result.OK("Hello，" + name);
public Results<String> getMessage(String name) {
return Results.OK("Hello，" + name);
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/MockController.java
+4 -4
View File
@@ -1,6 +1,6 @@
package com.jero.modules.demo.mock;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -120,8 +120,8 @@ public class MockController {
* @return
*/
@GetMapping("/queryDiskInfo")
public Result<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){
Result<List<Map<String,Object>>> res = new Result<>();
public Results<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){
Results<List<Map<String,Object>>> res = new Results<>();
try {
// 当前文件系统类
FileSystemView fsv = FileSystemView.getFileSystemView();
@@ -145,7 +145,7 @@ public class MockController {
res.setResult(list);
res.setMessage("查询成功");
} catch (Exception e) {
return Result.error("查询失败"+e.getMessage());
return Results.error("查询失败"+e.getMessage());
}
return res;
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java
+19 -19
View File
@@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.VXESocketConst;
import com.jero.common.system.query.MatchTypeEnum;
import com.jero.common.system.query.QueryCondition;
@@ -40,7 +40,7 @@ public class VxeMockController {
* @return
*/
@GetMapping("/change1")
public Result<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
public Results<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据
@@ -52,7 +52,7 @@ public class VxeMockController {
// 模拟更改数据
this.mockChange(rowData);
return Result.OK();
return Results.OK();
}
/**
@@ -63,7 +63,7 @@ public class VxeMockController {
* @return
*/
@GetMapping("/change2")
public Result<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
public Results<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据
@@ -76,7 +76,7 @@ public class VxeMockController {
// 模拟更改数据
this.mockChange(rowData);
return Result.OK();
return Results.OK();
}
/**
@@ -87,7 +87,7 @@ public class VxeMockController {
* @return
*/
@GetMapping("/change3")
public Result<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
public Results<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据
@@ -99,7 +99,7 @@ public class VxeMockController {
// 模拟更改数据
this.mockChange(rowData);
return Result.OK();
return Results.OK();
}
private void mockChange(JSONObject rowData) {
@@ -123,7 +123,7 @@ public class VxeMockController {
* @return
*/
@GetMapping("/change4")
public Result<T> mockChange4(@RequestParam("status") String status) {
public Results<T> mockChange4(@RequestParam("status") String status) {
// 封装socket数据
JSONObject socketData = new JSONObject();
// 这里的 key 是前端注册时使用的key，必须保持一致
@@ -136,7 +136,7 @@ public class VxeMockController {
// 调用 sendMessageToAll 发送给所有在线的用户
VXESocket.sendMessageToAll(message);
return Result.OK();
return Results.OK();
}
/**
@@ -145,11 +145,11 @@ public class VxeMockController {
* @param rowData 行数据，实际使用时可以替换成一个实体类
*/
@PostMapping ("/immediateSaveRow")
public Result<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException {
public Results<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException {
log.info("即时保存.rowData：" + rowData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(500);
return Result.OK();
return Results.OK();
}
/**
@@ -158,7 +158,7 @@ public class VxeMockController {
* @param tableData 表格数据（实际使用时可以替换成一个List实体类）
*/
@PostMapping("/immediateSaveAll")
public Result<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException {
public Results<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException {
// 【注】：
// 1、tableData里包含该页所有的数据
// 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了，
@@ -169,7 +169,7 @@ public class VxeMockController {
log.info("即时保存.tableData：" + tableData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(1000);
return Result.OK();
return Results.OK();
}
/**
@@ -181,7 +181,7 @@ public class VxeMockController {
* @return
*/
@GetMapping("/getData")
public Result<IPage<JSONObject>> getMockData(
public Results<IPage<JSONObject>> getMockData(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
// 父级id，根据父级id查询子级，如果为空则查询顶级
@@ -192,10 +192,10 @@ public class VxeMockController {
// 读取JSON数据
JSONArray dataList = readJsonData(path);
if (dataList == null) {
return Result.error("读取数据失败！");
return Results.error("读取数据失败！");
}
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
return Result.OK(page);
return Results.OK(page);
}
/**
@@ -207,7 +207,7 @@ public class VxeMockController {
* @return
*/
@GetMapping("/getDdjhData")
public Result<IPage<JSONObject>> getMockDdjhData(
public Results<IPage<JSONObject>> getMockDdjhData(
// SpringMVC 会自动将参数注入到实体里
MockEntity mockEntity,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -268,13 +268,13 @@ public class VxeMockController {
// 读取JSON数据
JSONArray dataList = readJsonData(path);
if (dataList == null) {
return Result.error("读取数据失败！");
return Results.error("读取数据失败！");
}
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
List<JSONObject> records = getJsonObjects(dataList, page);
page.setRecords(records);
return Result.OK(page);
return Results.OK(page);
}
@NotNull
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java
+25 -25
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.aspect.annotation.PermissionData;
import com.jero.common.constant.CommonConstant;
@@ -57,8 +57,8 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表")
@GetMapping(value = "/list")
@PermissionData(pageComponent = "jero/JeroDemoList")
public Result<IPage<JeroDemo>> list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
public Results<IPage<JeroDemo>> list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<JeroDemo> queryWrapper = QueryGenerator.initQueryWrapper(jeroDemo, req.getParameterMap());
Page<JeroDemo> page = new Page<>(pageNo, pageSize);
@@ -67,7 +67,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
log.info("查询当前页数量：" + pageList.getSize());
log.info("查询结果数量：" + pageList.getRecords().size());
log.info("数据总数：" + pageList.getTotal());
return Result.OK(pageList);
return Results.OK(pageList);
}
/**
@@ -79,9 +79,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@PostMapping(value = "/add")
@AutoLog(value = "添加测试DEMO")
@ApiOperation(value = "添加DEMO", notes = "添加DEMO")
public Result<T> add(@RequestBody JeroDemo jeroDemo) {
public Results<T> add(@RequestBody JeroDemo jeroDemo) {
JeroDemoService.save(jeroDemo);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
/**
@@ -93,9 +93,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@PostMapping(value = "/edit")
@ApiOperation(value = "编辑DEMO", notes = "编辑DEMO")
@AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3)
public Result<T> edit(@RequestBody JeroDemo jeroDemo) {
public Results<T> edit(@RequestBody JeroDemo jeroDemo) {
JeroDemoService.updateById(jeroDemo);
return Result.OK("更新成功！");
return Results.OK("更新成功！");
}
/**
@@ -107,13 +107,13 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
@AutoLog(value = "删除测试DEMO")
@PostMapping(value = "/delete")
@ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO")
public Result<T> delete(@RequestBody Map<String, String> map) {
public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
JeroDemoService.removeById(id);
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
/**
@@ -124,13 +124,13 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/
@PostMapping(value = "/deleteBatch")
@ApiOperation(value = "批量删除DEMO", notes = "批量删除DEMO")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
this.JeroDemoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！");
return Results.OK("批量删除成功！");
}
/**
@@ -141,9 +141,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/
@GetMapping(value = "/queryById")
@ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO")
public Result<JeroDemo> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
public Results<JeroDemo> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
JeroDemo jeroDemo = JeroDemoService.getById(id);
return Result.OK(jeroDemo);
return Results.OK(jeroDemo);
}
/**
@@ -168,7 +168,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<JeroDemo> importExcel(HttpServletRequest request, HttpServletResponse response) {
public Results<JeroDemo> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, JeroDemo.class);
}
@@ -245,9 +245,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
// ==========================================动态表单 JSON接收测试===========================================
@PostMapping(value = "/testOnlineAdd")
public Result<T> testOnlineAdd(@RequestBody JSONObject json) {
public Results<T> testOnlineAdd(@RequestBody JSONObject json) {
log.info(json.toJSONString());
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
/*----------------------------------------外部获取权限示例------------------------------------*/
@@ -262,14 +262,14 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/
@GetMapping(value = "/mpList")
@PermissionData(pageComponent = "jero/JeroDemoList")
public Result<IPage<JeroDemo>> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
public Results<IPage<JeroDemo>> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<JeroDemo> queryWrapper = new QueryWrapper<JeroDemo>();
//编程方式，给queryWrapper装载数据权限规则
QueryGenerator.installAuthMplus(queryWrapper, JeroDemo.class);
Page<JeroDemo> page = new Page<JeroDemo>(pageNo, pageSize);
IPage<JeroDemo> pageList = JeroDemoService.page(page, queryWrapper);
return Result.OK(pageList);
return Results.OK(pageList);
}
/**
@@ -283,9 +283,9 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
*/
@GetMapping(value = "/sqlList")
@PermissionData(pageComponent = "jero/JeroDemoList")
public Result<IPage<JeroDemo>> loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
public Results<IPage<JeroDemo>> loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
IPage<JeroDemo> pageList = JeroDemoService.queryListWithPermission(pageSize, pageNo);
return Result.OK(pageList);
return Results.OK(pageList);
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java
+23 -23
View File
@@ -3,7 +3,7 @@ package com.jero.modules.demo.test.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
@@ -65,11 +65,11 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@GetMapping(value = "/list")
public Result<IPage<JeroOrderMain>> queryPageList(JeroOrderMain jeroOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
public Results<IPage<JeroOrderMain>> queryPageList(JeroOrderMain jeroOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap());
Page<JeroOrderMain> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper);
return Result.OK(pageList);
return Results.OK(pageList);
}
/**
@@ -79,11 +79,11 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@PostMapping(value = "/add")
public Result<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
public Results<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.saveMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
/**
@@ -93,11 +93,11 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@PostMapping(value = "/edit")
public Result<T> eidt(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
public Results<T> eidt(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.updateCopyMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList());
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
/**
@@ -107,13 +107,13 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
jeroOrderMainService.delMain(id);
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
/**
@@ -123,13 +123,13 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
this.jeroOrderMainService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
return Results.OK("批量删除成功!");
}
/**
@@ -139,9 +139,9 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@GetMapping(value = "/queryById")
public Result<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) {
public Results<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) {
JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id);
return Result.OK(jeroOrderMain);
return Results.OK(jeroOrderMain);
}
/**
@@ -151,9 +151,9 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@GetMapping(value = "/queryOrderCustomerListByMainId")
public Result<List<JeroOrderCustomer>> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) {
public Results<List<JeroOrderCustomer>> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) {
List<JeroOrderCustomer> jeroOrderCustomerList = jeroOrderCustomerService.selectCustomersByMainId(id);
return Result.OK(jeroOrderCustomerList);
return Results.OK(jeroOrderCustomerList);
}
/**
@@ -163,9 +163,9 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
* @return
*/
@GetMapping(value = "/queryOrderTicketListByMainId")
public Result<List<JeroOrderTicket>> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) {
public Results<List<JeroOrderTicket>> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) {
List<JeroOrderTicket> jeroOrderTicketList = jeroOrderTicketService.selectTicketsByMainId(id);
return Result.OK(jeroOrderTicketList);
return Results.OK(jeroOrderTicketList);
}
/**
@@ -217,7 +217,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
*/
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -233,10 +233,10 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
BeanUtils.copyProperties(page, po);
jeroOrderMainService.saveMain(po, page.getJeroOrderCustomerList(), page.getJeroOrderTicketList());
}
return Result.OK("文件导入成功！");
return Results.OK("文件导入成功！");
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("文件导入失败：" + e.getMessage());
return Results.error("文件导入失败：" + e.getMessage());
} finally {
try {
file.getInputStream().close();
@@ -245,7 +245,7 @@ public class JeroOrderMainController extends JeroController<JeroOrderMain, IJero
}
}
}
return Result.error("文件导入失败！");
return Results.error("文件导入失败！");
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java
+48 -50
View File
@@ -5,7 +5,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import com.jero.common.api.vo.ResultConstant;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.demo.test.entity.JeroOrderCustomer;
@@ -19,10 +19,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -62,14 +60,14 @@ public class JeroOrderTabMainController {
* @return
*/
@GetMapping(value = "/orderList")
public Result<IPage<JeroOrderMain>> respondePagedData(JeroOrderMain jeroOrderMain,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
public Results<IPage<JeroOrderMain>> respondePagedData(JeroOrderMain jeroOrderMain,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<JeroOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap());
Page<JeroOrderMain> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderMain> pageList = jeroOrderMainService.page(page, queryWrapper);
return Result.OK(pageList);
return Results.OK(pageList);
}
/**
@@ -79,11 +77,11 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/add")
public Result<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
public Results<T> add(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.save(jeroOrderMain);
return Result.OK(ResultConstant.OP_OK);
return Results.OK(ResultConstant.OP_OK);
}
/**
@@ -93,11 +91,11 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping("/edit")
public Result<T> edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
public Results<T> edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) {
JeroOrderMain jeroOrderMain = new JeroOrderMain();
BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain);
jeroOrderMainService.updateById(jeroOrderMain);
return Result.OK(ResultConstant.OP_OK);
return Results.OK(ResultConstant.OP_OK);
}
/**
@@ -107,13 +105,13 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/delete")
public Result<T> delete(@RequestBody Map<String, String> map) {
public Results<T> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
jeroOrderMainService.delMain(id);
return Result.OK(ResultConstant.DEL_OK);
return Results.OK(ResultConstant.DEL_OK);
}
/**
@@ -123,13 +121,13 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/deleteBatch")
public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
public Results<T> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
this.jeroOrderMainService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK(ResultConstant.BATCH_DEL_OK);
return Results.OK(ResultConstant.BATCH_DEL_OK);
}
/**
@@ -139,9 +137,9 @@ public class JeroOrderTabMainController {
* @return
*/
@GetMapping(value = "/queryById")
public Result<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) {
public Results<JeroOrderMain> queryById(@RequestParam(name = "id", required = true) String id) {
JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id);
return Result.OK(jeroOrderMain);
return Results.OK(jeroOrderMain);
}
@@ -152,14 +150,14 @@ public class JeroOrderTabMainController {
* @return
*/
@GetMapping(value = "/listOrderCustomerByMainId")
public Result<IPage<JeroOrderCustomer>> queryOrderCustomerListByMainId(JeroOrderCustomer jeroOrderCustomer,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
public Results<IPage<JeroOrderCustomer>> queryOrderCustomerListByMainId(JeroOrderCustomer jeroOrderCustomer,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<JeroOrderCustomer> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderCustomer, req.getParameterMap());
Page<JeroOrderCustomer> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderCustomer> pageList = jeroOrderCustomerService.page(page, queryWrapper);
return Result.OK(pageList);
return Results.OK(pageList);
}
/**
@@ -169,14 +167,14 @@ public class JeroOrderTabMainController {
* @return
*/
@GetMapping(value = "/listOrderTicketByMainId")
public Result<IPage<JeroOrderTicket>> queryOrderTicketListByMainId(JeroOrderTicket jeroOrderTicket,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
public Results<IPage<JeroOrderTicket>> queryOrderTicketListByMainId(JeroOrderTicket jeroOrderTicket,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<JeroOrderTicket> queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderTicket, req.getParameterMap());
Page<JeroOrderTicket> page = new Page<>(pageNo, pageSize);
IPage<JeroOrderTicket> pageList = jeroOrderTicketService.page(page, queryWrapper);
return Result.OK(pageList);
return Results.OK(pageList);
}
/**
@@ -186,9 +184,9 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/addCustomer")
public Result<T> addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) {
public Results<T> addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) {
jeroOrderCustomerService.save(jeroOrderCustomer);
return Result.OK(ResultConstant.OP_OK);
return Results.OK(ResultConstant.OP_OK);
}
/**
@@ -198,9 +196,9 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping("/editCustomer")
public Result<T> editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) {
public Results<T> editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) {
jeroOrderCustomerService.updateById(jeroOrderCustomer);
return Result.OK(ResultConstant.OP_OK);
return Results.OK(ResultConstant.OP_OK);
}
/**
@@ -210,13 +208,13 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/deleteCustomer")
public Result<T> deleteCustomer(@RequestBody Map<String, String> map) {
public Results<T> deleteCustomer(@RequestBody Map<String, String> map) {
String id = map.get("id");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
jeroOrderCustomerService.removeById(id);
return Result.OK(ResultConstant.DEL_OK);
return Results.OK(ResultConstant.DEL_OK);
}
/**
@@ -226,13 +224,13 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/deleteBatchCustomer")
public Result<T> deleteBatchCustomer(@RequestBody Map<String, String> map) {
public Results<T> deleteBatchCustomer(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
this.jeroOrderCustomerService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK(ResultConstant.BATCH_DEL_OK);
return Results.OK(ResultConstant.BATCH_DEL_OK);
}
/**
@@ -242,9 +240,9 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/addTicket")
public Result<T> addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) {
public Results<T> addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) {
jeroOrderTicketService.save(jeroOrderTicket);
return Result.OK(ResultConstant.OP_OK);
return Results.OK(ResultConstant.OP_OK);
}
/**
@@ -254,9 +252,9 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping("/editTicket")
public Result<T> editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) {
public Results<T> editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) {
jeroOrderTicketService.updateById(jeroOrderTicket);
return Result.OK(ResultConstant.OP_OK);
return Results.OK(ResultConstant.OP_OK);
}
/**
@@ -266,13 +264,13 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/deleteTicket")
public Result<T> deleteTicket(@RequestBody Map<String, String> map) {
public Results<T> deleteTicket(@RequestBody Map<String, String> map) {
String id = map.get("id");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
jeroOrderTicketService.removeById(id);
return Result.OK(ResultConstant.DEL_OK);
return Results.OK(ResultConstant.DEL_OK);
}
/**
@@ -282,13 +280,13 @@ public class JeroOrderTabMainController {
* @return
*/
@PostMapping(value = "/deleteBatchTicket")
public Result<T> deleteBatchTicket(@RequestBody Map<String, String> map) {
public Results<T> deleteBatchTicket(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
if(StringUtils.isBlank(ids)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
this.jeroOrderTicketService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK(ResultConstant.BATCH_DEL_OK);
return Results.OK(ResultConstant.BATCH_DEL_OK);
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java
+28 -28
View File
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.api.vo.Results;
import com.jero.common.api.vo.ResultConstant;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
@@ -56,11 +56,11 @@ public class JoaDemoController {
* @return
*/
@GetMapping(value = "/list")
public Result<IPage<JoaDemo>> queryPageList(JoaDemo joaDemo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<JoaDemo>> result = new Result<>();
public Results<IPage<JoaDemo>> queryPageList(JoaDemo joaDemo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Results<IPage<JoaDemo>> result = new Results<>();
QueryWrapper<JoaDemo> queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, req.getParameterMap());
Page<JoaDemo> page = new Page<>(pageNo, pageSize);
IPage<JoaDemo> pageList = joaDemoService.page(page, queryWrapper);
@@ -75,13 +75,13 @@ public class JoaDemoController {
* @return
*/
@PostMapping(value = "/add")
public Result<Object> add(@RequestBody JoaDemo joaDemo) {
public Results<Object> add(@RequestBody JoaDemo joaDemo) {
try {
joaDemoService.save(joaDemo);
return Result.OK("操作成功!");
return Results.OK("操作成功!");
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("操作失败");
return Results.error("操作失败");
}
}
@@ -91,18 +91,18 @@ public class JoaDemoController {
* @return
*/
@PostMapping(value = "/edit")
public Result<Object> edit(@RequestBody JoaDemo joaDemo) {
public Results<Object> edit(@RequestBody JoaDemo joaDemo) {
JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId());
if(joaDemoEntity==null) {
return Result.error(ResultConstant.EN_WAS_NOT_FOUND);
return Results.error(ResultConstant.EN_WAS_NOT_FOUND);
}else {
boolean ok = joaDemoService.updateById(joaDemo);
if(ok) {
return Result.OK("操作成功!");
return Results.OK("操作成功!");
}
}
return Result.OK();
return Results.OK();
}
/**
@@ -111,21 +111,21 @@ public class JoaDemoController {
* @return
*/
@PostMapping(value = "/delete")
public Result<Object> delete(@RequestBody Map<String, String> map) {
public Results<Object> delete(@RequestBody Map<String, String> map) {
String id = map.get("id");
if(StringUtils.isBlank(id)){
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}
JoaDemo joaDemo = joaDemoService.getById(id);
if(joaDemo==null) {
return Result.error(ResultConstant.EN_WAS_NOT_FOUND);
return Results.error(ResultConstant.EN_WAS_NOT_FOUND);
}else {
boolean ok = joaDemoService.removeById(id);
if(ok) {
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
}
return Result.OK();
return Results.OK();
}
/**
@@ -134,13 +134,13 @@ public class JoaDemoController {
* @return
*/
@PostMapping(value = "/deleteBatch")
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) {
public Results<Object> deleteBatch(@RequestBody Map<String, String> map) {
String ids = map.get("ids");
if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
return Results.error("参数不识别！");
}else {
this.joaDemoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("删除成功!");
return Results.OK("删除成功!");
}
}
@@ -150,12 +150,12 @@ public class JoaDemoController {
* @return
*/
@GetMapping(value = "/queryById")
public Result<JoaDemo> queryById(@RequestParam(name="id",required=true) String id) {
public Results<JoaDemo> queryById(@RequestParam(name="id",required=true) String id) {
JoaDemo joaDemo = joaDemoService.getById(id);
if(joaDemo==null) {
return Result.error(ResultConstant.EN_WAS_NOT_FOUND);
return Results.error(ResultConstant.EN_WAS_NOT_FOUND);
}else {
return Result.OK(joaDemo);
return Results.OK(joaDemo);
}
}
@@ -200,7 +200,7 @@ public class JoaDemoController {
*/
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
public Results<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -214,10 +214,10 @@ public class JoaDemoController {
for (JoaDemo joaDemoExcel : listJoaDemos) {
joaDemoService.save(joaDemoExcel);
}
return Result.OK("文件导入成功！数据行数:" + listJoaDemos.size());
return Results.OK("文件导入成功！数据行数:" + listJoaDemos.size());
} catch (Exception e) {
log.error(e.getMessage(),e);
return Result.error("文件导入失败:"+e.getMessage());
return Results.error("文件导入失败:"+e.getMessage());
} finally {
try {
file.getInputStream().close();
@@ -226,7 +226,7 @@ public class JoaDemoController {
}
}
}
return Result.OK("文件导入失败！");
return Results.OK("文件导入失败！");
}
}
jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java
+19 -19
View File
@@ -6,10 +6,10 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Results;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.MatchTypeEnum;
import com.jero.common.system.query.QueryCondition;
import com.jero.common.system.query.QueryGenerator;
@@ -40,7 +40,7 @@ public class DlMockController {
* @return
*/
@GetMapping("/change1")
public Result<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
public Results<T> mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据
@@ -52,7 +52,7 @@ public class DlMockController {
// 模拟更改数据
this.mockChange(rowData);
return Result.OK();
return Results.OK();
}
/**
@@ -63,7 +63,7 @@ public class DlMockController {
* @return
*/
@GetMapping("/change2")
public Result<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
public Results<T> mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据
@@ -76,7 +76,7 @@ public class DlMockController {
// 模拟更改数据
this.mockChange(rowData);
return Result.OK();
return Results.OK();
}
/**
@@ -87,7 +87,7 @@ public class DlMockController {
* @return
*/
@GetMapping("/change3")
public Result<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
public Results<T> mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
/* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */
// 封装行数据
@@ -99,7 +99,7 @@ public class DlMockController {
// 模拟更改数据
this.mockChange(rowData);
return Result.OK();
return Results.OK();
}
private void mockChange(JSONObject rowData) {
@@ -122,7 +122,7 @@ public class DlMockController {
* @return
*/
@GetMapping("/change4")
public Result<T> mockChange4(@RequestParam("status") String status) {
public Results<T> mockChange4(@RequestParam("status") String status) {
// 封装socket数据
JSONObject socketData = new JSONObject();
// 这里的 key 是前端注册时使用的key，必须保持一致
@@ -135,7 +135,7 @@ public class DlMockController {
// 调用 sendMessageToAll 发送给所有在线的用户
VXESocket.sendMessageToAll(message);
return Result.OK();
return Results.OK();
}
/**
@@ -144,11 +144,11 @@ public class DlMockController {
* @param rowData 行数据，实际使用时可以替换成一个实体类
*/
@PostMapping("/immediateSaveRow")
public Result<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException {
public Results<T> mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException {
log.info("即时保存.rowData：" + rowData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(500);
return Result.OK();
return Results.OK();
}
/**
@@ -157,7 +157,7 @@ public class DlMockController {
* @param tableData 表格数据（实际使用时可以替换成一个List实体类）
*/
@PostMapping("/immediateSaveAll")
public Result<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException {
public Results<T> mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException {
// 【注】：
// 1、tableData里包含该页所有的数据
// 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了，
@@ -168,7 +168,7 @@ public class DlMockController {
log.info("即时保存.tableData：" + tableData.toJSONString());
// 延时1.5秒，模拟网慢堵塞真实感
Thread.sleep(1000);
return Result.OK();
return Results.OK();
}
/**
@@ -180,7 +180,7 @@ public class DlMockController {
* @return
*/
@GetMapping("/getData")
public Result<IPage<JSONObject>> getMockData(
public Results<IPage<JSONObject>> getMockData(
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
// 父级id，根据父级id查询子级，如果为空则查询顶级
@@ -191,10 +191,10 @@ public class DlMockController {
// 读取JSON数据
JSONArray dataList = readJsonData(path);
if (dataList == null) {
return Result.error("读取数据失败！");
return Results.error("读取数据失败！");
}
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
return Result.OK(page);
return Results.OK(page);
}
/**
@@ -206,7 +206,7 @@ public class DlMockController {
* @return
*/
@GetMapping("/getDdjhData")
public Result<IPage<JSONObject>> getMockDdjhData(
public Results<IPage<JSONObject>> getMockDdjhData(
// SpringMVC 会自动将参数注入到实体里
MockEntity mockEntity,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -246,14 +246,14 @@ public class DlMockController {
// 读取JSON数据
JSONArray dataList = readJsonData(path);
if (dataList == null) {
return Result.error("读取数据失败！");
return Results.error("读取数据失败！");
}
IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
// 逐行查询子表数据，用于计算拖轮状态
List<JSONObject> records = getJsonObjects(dataList, page);
page.setRecords(records);
return Result.OK(page);
return Results.OK(page);
}
@NotNull