diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgdata/EcgdataController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgdata/EcgdataController.java index 9c333aaaf2..71e38362e6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgdata/EcgdataController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgdata/EcgdataController.java @@ -108,31 +108,18 @@ public class EcgdataController { } @GetMapping("/getByTime") - @Operation(summary = "根据时间戳和用户ID获得心电数据(聚合图片URL)") + @Operation(summary = "根据时间戳和用户ID获得心电数据") @Parameter(name = "collecttime", description = "采集时间戳", required = true) @Parameter(name = "userId", description = "用户编号", required = true) - public CommonResult getEcgdataByTime(@RequestParam("collecttime") Long collecttime, - @RequestParam("userId") Integer userId) { - List ecgdataList = ecgdataService.getEcgdataListByTime(collecttime, userId); + public CommonResult getEcgdataByTime(@RequestParam("collecttime") Long collecttime, + @RequestParam("userId") Integer userId) { + EcgdataDO ecgdata = ecgdataService.getEcgdataByTime(collecttime, userId); - if (ecgdataList == null || ecgdataList.isEmpty()) { + if (ecgdata == null) { return success(null); } - // 取第一条记录作为基础数据 - EcgdataDO firstEcgdata = ecgdataList.get(0); - EcgdataTimeImageRespVO result = BeanUtils.toBean(firstEcgdata, EcgdataTimeImageRespVO.class); - - // 聚合所有的图片URL - List imageUrls = new ArrayList<>(); - for (EcgdataDO ecgdata : ecgdataList) { - if (ecgdata.getEcgimageurl() != null && !ecgdata.getEcgimageurl().trim().isEmpty()) { - imageUrls.add(ecgdata.getEcgimageurl()); - } - } - result.setEcgimageurls(imageUrls); - - return success(result); + return success(BeanUtils.toBean(ecgdata, EcgdataRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataService.java index 4b92571c29..f8c6643a29 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataService.java @@ -71,16 +71,7 @@ public interface EcgdataService { EcgdataDO getEcgdataByTime(Long collecttime, Integer userId); /** - * 根据时间戳和用户ID获得心电数据采集列表(聚合图片URL) - * - * @param collecttime 采集时间戳 - * @param userId 用户编号 - * @return 聚合后的心电数据采集 - */ - List getEcgdataListByTime(Long collecttime, Integer userId); - - /** - * 根据用户ID获得去重的心电采集时间列表 + * 根据用户ID获得心电数据采集去重时间列表 * * @param userId 用户编号 * @return 去重的采集时间列表 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataServiceImpl.java index dc23da3e02..311f470408 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataServiceImpl.java @@ -88,14 +88,6 @@ public class EcgdataServiceImpl implements EcgdataService { .orderByDesc(EcgdataDO::getId)); } - @Override - public List getEcgdataListByTime(Long collecttime, Integer userId) { - return ecgdataMapper.selectList(new LambdaQueryWrapperX() - .eq(EcgdataDO::getUserid, userId) - .eq(EcgdataDO::getCollecttime, new Date(collecttime)) - .orderByDesc(EcgdataDO::getId)); - } - @Override public List getDistinctCollectTimeByUserId(Integer userId) { return ecgdataMapper.selectDistinctCollectTimeByUserId(userId);