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] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E7=A7=9F=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> 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/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 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 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 getDeviceuserByDeviceId(Integer deviceid) { + return deviceuserMapper.selectList(new LambdaQueryWrapper() + .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