diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java index d4bef5de03..054eaed7ef 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/deviceuser/DeviceuserController.java @@ -90,4 +90,12 @@ public class DeviceuserController { BeanUtils.toBean(list, DeviceuserRespVO.class)); } + @GetMapping("/getDeviceuserByDeviceId") + @Operation(summary = "根据设备ID获得设备人员关联") + @Parameter(name = "deviceid", description = "设备编号", required = true) + public CommonResult> getDeviceuserByDeviceId(@RequestParam("deviceid") Integer deviceid) { + List deviceusers = deviceuserService.getDeviceuserByDeviceId(deviceid); + return success(BeanUtils.toBean(deviceusers, DeviceuserRespVO.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/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 0f83ddf51e..978b77cc95 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 @@ -86,4 +86,22 @@ public class EcgdataController { BeanUtils.toBean(list, EcgdataRespVO.class)); } + @GetMapping("/getByUserId") + @Operation(summary = "根据用户ID获得心电采集时间列表") + @Parameter(name = "userId", description = "用户编号", required = true, example = "1024") + public CommonResult> getEcgdataByUserId(@RequestParam("userId") Integer userId) { + List ecgdataList = ecgdataService.getEcgdataByUserId(userId); + return success(BeanUtils.toBean(ecgdataList, EcgdataTimeRespVO.class)); + } + + @GetMapping("/getByTime") + @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) { + EcgdataDO ecgdata = ecgdataService.getEcgdataByTime(collecttime, userId); + 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/controller/admin/ecgdata/vo/EcgdataTimeRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgdata/vo/EcgdataTimeRespVO.java new file mode 100644 index 0000000000..cd9f2494fc --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgdata/vo/EcgdataTimeRespVO.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.module.system.controller.admin.ecgdata.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 心电数据采集时间 Response VO") +@Data +public class EcgdataTimeRespVO { + + @Schema(description = "采集时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime collecttime; + +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgdata/EcgdataDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgdata/EcgdataDO.java index 45cc974e82..f64aeb1e92 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgdata/EcgdataDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/ecgdata/EcgdataDO.java @@ -17,12 +17,11 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @TableName("tb_ecgdata") @KeySequence("tb_ecgdata_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 @Data -@EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class EcgdataDO extends BaseDO { +public class EcgdataDO { /** * 主键ID diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java index c32cd809cc..1e203e2228 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserService.java @@ -56,4 +56,12 @@ public interface DeviceuserService { */ PageResult getDeviceuserPage(DeviceuserPageReqVO pageReqVO); + /** + * 根据设备ID获得设备人员关联列表 + * + * @param deviceid 设备编号 + * @return 设备人员关联列表 + */ + List getDeviceuserByDeviceId(Integer deviceid); + } \ 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/deviceuser/DeviceuserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java index 7cea5ac305..acbcd30a86 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceuser/DeviceuserServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.service.deviceuser; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -71,4 +72,10 @@ public class DeviceuserServiceImpl implements DeviceuserService { return deviceuserMapper.selectPage(pageReqVO); } + @Override + public List getDeviceuserByDeviceId(Integer deviceid) { + return deviceuserMapper.selectList(new LambdaQueryWrapper() + .eq(DeviceuserDO::getDeviceid, deviceid)); + } + } \ 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 533fb3e08e..b7597a4543 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 @@ -52,4 +52,21 @@ public interface EcgdataService { */ PageResult getEcgdataPage(EcgdataPageReqVO pageReqVO); + /** + * 根据用户ID获得心电数据采集列表 + * + * @param userId 用户编号 + * @return 心电数据采集列表 + */ + List getEcgdataByUserId(Integer userId); + + /** + * 根据时间戳和用户ID获得心电数据采集 + * + * @param collecttime 采集时间戳 + * @param userId 用户编号 + * @return 心电数据采集 + */ + EcgdataDO getEcgdataByTime(Long collecttime, Integer userId); + } \ 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/EcgdataServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/ecgdata/EcgdataServiceImpl.java index 427a57cdfd..3b412d1913 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 @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.service.ecgdata; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -71,4 +72,19 @@ public class EcgdataServiceImpl implements EcgdataService { return ecgdataMapper.selectPage(pageReqVO); } + @Override + public List getEcgdataByUserId(Integer userId) { + return ecgdataMapper.selectList(new LambdaQueryWrapperX() + .eq(EcgdataDO::getUserid, userId) + .orderByDesc(EcgdataDO::getId)); + } + + @Override + public EcgdataDO getEcgdataByTime(Long collecttime, Integer userId) { + return ecgdataMapper.selectOne(new LambdaQueryWrapperX() + .eq(EcgdataDO::getUserid, userId) + .eq(EcgdataDO::getCollecttime, new Date(collecttime)) + .orderByDesc(EcgdataDO::getId)); + } + } \ No newline at end of file diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index ad1ffd4b36..d85b3707f9 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -281,6 +281,11 @@ yudao: - tb_person_archive # 忽略人员档案表 - tb_user # 忽略小程序用户表 - visit_record # 忽略电话回访记录表 + - tb_device # 忽略设备表 + - tb_deviceuser # 忽略设备用户表 + - tb_devicedata # 忽略设备数据表 + - tb_ecgdata # 忽略ECG设备数据类型表 + - tb_doctornotice # 忽略医生通知表 ignore-caches: - user_role_ids - permission_menu_ids