From ab1d59637c19d69dd6133243799ca0f0af1fe8e4 Mon Sep 17 00:00:00 2001
From: Flow <958079825@qq.com>
Date: Tue, 10 Jun 2025 10:23:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/deviceuser/DeviceuserController.java | 8 ++++++++
 .../system/dal/dataobject/deviceuser/DeviceuserDO.java    | 3 +--
 .../module/system/dal/dataobject/ecgdata/EcgdataDO.java   | 3 +--
 .../system/service/deviceuser/DeviceuserService.java      | 8 ++++++++
 .../system/service/deviceuser/DeviceuserServiceImpl.java  | 7 +++++++
 yudao-server/src/main/resources/application.yaml          | 5 +++++
 6 files changed, 30 insertions(+), 4 deletions(-)

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 148b219492..4d8a3ed668 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
@@ -86,4 +86,12 @@ public class DeviceuserController {
                         BeanUtils.toBean(list, DeviceuserRespVO.class));
     }
 
+    @GetMapping("/getDeviceuserByDeviceId")
+    @Operation(summary = "根据设备ID获得设备人员关联")
+    @Parameter(name = "deviceid", description = "设备编号", required = true)
+    public CommonResult<List<DeviceuserRespVO>> getDeviceuserByDeviceId(@RequestParam("deviceid") Integer deviceid) {
+        List<DeviceuserDO> 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/dal/dataobject/deviceuser/DeviceuserDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/deviceuser/DeviceuserDO.java
index ce7f26b090..5ac281aa82 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/deviceuser/DeviceuserDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/deviceuser/DeviceuserDO.java
@@ -15,12 +15,11 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @TableName("tb_deviceuser")
 @KeySequence("tb_deviceuser_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class DeviceuserDO extends BaseDO {
+public class DeviceuserDO  {
 
     /**
      * 主键ID
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 f7f0ca9c18..0a1c1060bf 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
@@ -52,4 +52,12 @@ public interface DeviceuserService {
      */
     PageResult<DeviceuserDO> getDeviceuserPage(DeviceuserPageReqVO pageReqVO);
 
+    /**
+     * 根据设备ID获得设备人员关联列表
+     *
+     * @param deviceid 设备编号
+     * @return 设备人员关联列表
+     */
+    List<DeviceuserDO> 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 a24da6e105..ac6a879373 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<DeviceuserDO> getDeviceuserByDeviceId(Integer deviceid) {
+        return deviceuserMapper.selectList(new LambdaQueryWrapper<DeviceuserDO>()
+                .eq(DeviceuserDO::getDeviceid, deviceid));
+    }
+
 }
\ 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..802ce9a5ac 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_tb_ecgdata # 忽略ECG设备数据类型表
+      - tb_doctornotice # 忽略医生通知表
     ignore-caches:
       - user_role_ids
       - permission_menu_ids

From 00ad7b3fb946b9d2f3417cc0295f71825bd85b30 Mon Sep 17 00:00:00 2001
From: Flow <958079825@qq.com>
Date: Tue, 10 Jun 2025 10:38:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/ecgdata/EcgdataController.java       | 8 ++++++++
 .../module/system/service/ecgdata/EcgdataService.java     | 8 ++++++++
 .../module/system/service/ecgdata/EcgdataServiceImpl.java | 8 ++++++++
 yudao-server/src/main/resources/application.yaml          | 2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)

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..f0fa849d92 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,12 @@ public class EcgdataController {
                         BeanUtils.toBean(list, EcgdataRespVO.class));
     }
 
+    @GetMapping("/getByUserId")
+    @Operation(summary = "根据用户ID获得心电数据采集")
+    @Parameter(name = "userId", description = "用户编号", required = true, example = "1024")
+    public CommonResult<List<EcgdataRespVO>> getEcgdataByUserId(@RequestParam("userId") Integer userId) {
+        List<EcgdataDO> ecgdataList = ecgdataService.getEcgdataByUserId(userId);
+        return success(BeanUtils.toBean(ecgdataList, 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 533fb3e08e..848fd74558 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,12 @@ public interface EcgdataService {
      */
     PageResult<EcgdataDO> getEcgdataPage(EcgdataPageReqVO pageReqVO);
 
+    /**
+     * 根据用户ID获得心电数据采集列表
+     *
+     * @param userId 用户编号
+     * @return 心电数据采集列表
+     */
+    List<EcgdataDO> getEcgdataByUserId(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..b24612b19d 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,11 @@ public class EcgdataServiceImpl implements EcgdataService {
         return ecgdataMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<EcgdataDO> getEcgdataByUserId(Integer userId) {
+        return ecgdataMapper.selectList(new LambdaQueryWrapperX<EcgdataDO>()
+                .eq(EcgdataDO::getUserid, userId)
+                .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 802ce9a5ac..d85b3707f9 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -284,7 +284,7 @@ yudao:
       - tb_device # 忽略设备表
       - tb_deviceuser # 忽略设备用户表
       - tb_devicedata # 忽略设备数据表
-      - tb_tb_ecgdata # 忽略ECG设备数据类型表
+      - tb_ecgdata # 忽略ECG设备数据类型表
       - tb_doctornotice # 忽略医生通知表
     ignore-caches:
       - user_role_ids

From e3a9cff289af0a2d21eb65c627e5e394f5ebc3ac Mon Sep 17 00:00:00 2001
From: Flow <958079825@qq.com>
Date: Tue, 10 Jun 2025 14:19:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E9=9B=86=E6=97=B6=E9=97=B4VO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/ecgdata/EcgdataController.java         | 16 +++++++++++++---
 .../admin/ecgdata/vo/EcgdataTimeRespVO.java      | 14 ++++++++++++++
 .../system/service/ecgdata/EcgdataService.java   |  9 +++++++++
 .../service/ecgdata/EcgdataServiceImpl.java      |  8 ++++++++
 4 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ecgdata/vo/EcgdataTimeRespVO.java

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 f0fa849d92..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
@@ -87,11 +87,21 @@ public class EcgdataController {
     }
 
     @GetMapping("/getByUserId")
-    @Operation(summary = "根据用户ID获得心电数据采集")
+    @Operation(summary = "根据用户ID获得心电采集时间列表")
     @Parameter(name = "userId", description = "用户编号", required = true, example = "1024")
-    public CommonResult<List<EcgdataRespVO>> getEcgdataByUserId(@RequestParam("userId") Integer userId) {
+    public CommonResult<List<EcgdataTimeRespVO>> getEcgdataByUserId(@RequestParam("userId") Integer userId) {
         List<EcgdataDO> ecgdataList = ecgdataService.getEcgdataByUserId(userId);
-        return success(BeanUtils.toBean(ecgdataList, EcgdataRespVO.class));
+        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<EcgdataRespVO> 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/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 848fd74558..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
@@ -60,4 +60,13 @@ public interface EcgdataService {
      */
     List<EcgdataDO> 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 b24612b19d..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
@@ -79,4 +79,12 @@ public class EcgdataServiceImpl implements EcgdataService {
                 .orderByDesc(EcgdataDO::getId));
     }
 
+    @Override
+    public EcgdataDO getEcgdataByTime(Long collecttime, Integer userId) {
+        return ecgdataMapper.selectOne(new LambdaQueryWrapperX<EcgdataDO>()
+                .eq(EcgdataDO::getUserid, userId)
+                .eq(EcgdataDO::getCollecttime, new Date(collecttime))
+                .orderByDesc(EcgdataDO::getId));
+    }
+
 }
\ No newline at end of file