Merge branch 'dev' into cbs

This commit is contained in:
cbs 2025-07-19 14:34:49 +08:00
commit 45c37027a1

View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.controller.admin.positionmap;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.spring.SpringUtils;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapLineRespVO;
import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapLineSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapLineDO;
@ -15,7 +16,10 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@ -56,18 +60,42 @@ public class PositionMapLineController {
return success(BeanUtils.toBean(positionMapLine, PositionMapLineRespVO.class));
}
/**
* 以下两个方法区别 - 优化
* 方法一
* 查询后需在内存中转换并序列化全部数据
* 客户端必须等待所有数据处理完成才能接收响应
*
* 方法二
* 查询后直接流式输出序列化与传输并行
* 客户端几乎在查询完成后立即开始接收数据无内存堆积延迟
*/
// @GetMapping("/list")
// @Operation(summary = "通过地图id获取连线列表")
// @PreAuthorize("@ss.hasPermission('system:position-map-line:query')")
// public CommonResult<List<PositionMapLineDO>> list(@RequestParam Long positionMapId) {
// List<PositionMapLineDO> list = positionMapLineService.getByMapId(positionMapId);
// return success(list);
// }
@GetMapping("/list")
@Operation(summary = "通过地图id获取连线列表")
@PreAuthorize("@ss.hasPermission('system:position-map-line:query')")
public CommonResult<List<PositionMapLineRespVO>> list(@RequestParam Long positionMapId) {
long l = System.currentTimeMillis();
List<PositionMapLineDO> list = positionMapLineService.getByMapId(positionMapId);
log.info("查询总耗时:{}", System.currentTimeMillis() - l);
l = System.currentTimeMillis();
List<PositionMapLineRespVO> bean = BeanUtils.toBean(list, PositionMapLineRespVO.class);
log.info("转换bean总耗时:{}", System.currentTimeMillis() - l);
return success(bean);
public void list(@RequestParam Long positionMapId, HttpServletResponse response) {
// 设置响应头
response.setContentType("application/json;charset=UTF-8");
response.setHeader("Cache-Control", "no-cache");
try (OutputStream out = response.getOutputStream()) {
// 查询数据
List<PositionMapLineDO> list = positionMapLineService.getByMapId(positionMapId);
// 构造返回结果
CommonResult<List<PositionMapLineDO>> result = success(list);
// 使用 Jackson ObjectMapper 流式写入
SpringUtils.getBean(com.fasterxml.jackson.databind.ObjectMapper.class).writeValue(out, result);
} catch (IOException e) {
log.error("流式返回数据失败", e);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
}
}