From 0dc1dabca0e9e9e03aa501d738b42028d8a50fc8 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Mon, 9 Jun 2025 15:10:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/ErrorCodeConstants.java | 12 +++++++++ .../deviceuser/DeviceuserController.java | 6 ----- .../doctornotice/DoctornoticeController.java | 6 ----- .../admin/ecgdata/EcgdataController.java | 6 ----- .../dal/dataobject/device/DeviceDO.java | 12 +++++++++ .../dataobject/deviceuser/DeviceuserDO.java | 7 +++++ .../doctornotice/DoctornoticeDO.java | 15 +++++++++++ .../dal/dataobject/ecgdata/EcgdataDO.java | 26 +++++++++++++++++++ 8 files changed, 72 insertions(+), 18 deletions(-) diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index c03a7d7a9d..f9400e3d94 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -175,4 +175,16 @@ public interface ErrorCodeConstants { // ========== 电话回访记录 1-002-031-000 ========== ErrorCode RECORD_NOT_EXISTS = new ErrorCode(1_002_031_000, "电话回访记录不存在"); + // ========== 设备 1-002-032-000 ========== + ErrorCode DEVICE_NOT_EXISTS = new ErrorCode(1_002_032_000, "设备不存在"); + + // ========== 设备用户 1-002-032-001 ========== + ErrorCode DEVICEUSER_NOT_EXISTS = new ErrorCode(1_002_032_001, "设备用户不存在"); + + // ========== 医生通知 1-002-033-000 ========== + ErrorCode DOCTORNOTICE_NOT_EXISTS = new ErrorCode(1_002_033_000, "医生通知不存在"); + + // ========== ECG数据 1-002-034-000 ========== + ErrorCode ECGDATA_NOT_EXISTS = new ErrorCode(1_002_034_000, "ECG数据不存在"); + } 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 1590ef3c7f..148b219492 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 @@ -40,14 +40,12 @@ public class DeviceuserController { @PostMapping("/create") @Operation(summary = "创建设备人员关联") - @PreAuthorize("@ss.hasPermission('system:deviceuser:create')") public CommonResult createDeviceuser(@Valid @RequestBody DeviceuserSaveReqVO createReqVO) { return success(deviceuserService.createDeviceuser(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新设备人员关联") - @PreAuthorize("@ss.hasPermission('system:deviceuser:update')") public CommonResult updateDeviceuser(@Valid @RequestBody DeviceuserSaveReqVO updateReqVO) { deviceuserService.updateDeviceuser(updateReqVO); return success(true); @@ -56,7 +54,6 @@ public class DeviceuserController { @DeleteMapping("/delete") @Operation(summary = "删除设备人员关联") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('system:deviceuser:delete')") public CommonResult deleteDeviceuser(@RequestParam("id") Integer id) { deviceuserService.deleteDeviceuser(id); return success(true); @@ -65,7 +62,6 @@ public class DeviceuserController { @GetMapping("/get") @Operation(summary = "获得设备人员关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:deviceuser:query')") public CommonResult getDeviceuser(@RequestParam("id") Integer id) { DeviceuserDO deviceuser = deviceuserService.getDeviceuser(id); return success(BeanUtils.toBean(deviceuser, DeviceuserRespVO.class)); @@ -73,7 +69,6 @@ public class DeviceuserController { @GetMapping("/page") @Operation(summary = "获得设备人员关联分页") - @PreAuthorize("@ss.hasPermission('system:deviceuser:query')") public CommonResult> getDeviceuserPage(@Valid DeviceuserPageReqVO pageReqVO) { PageResult pageResult = deviceuserService.getDeviceuserPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceuserRespVO.class)); @@ -81,7 +76,6 @@ public class DeviceuserController { @GetMapping("/export-excel") @Operation(summary = "导出设备人员关联 Excel") - @PreAuthorize("@ss.hasPermission('system:deviceuser:export')") @ApiAccessLog(operateType = EXPORT) public void exportDeviceuserExcel(@Valid DeviceuserPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java index 3bf28f4b7e..01e780a282 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctornotice/DoctornoticeController.java @@ -40,14 +40,12 @@ public class DoctornoticeController { @PostMapping("/create") @Operation(summary = "创建医生通知") - @PreAuthorize("@ss.hasPermission('system:doctornotice:create')") public CommonResult createDoctornotice(@Valid @RequestBody DoctornoticeSaveReqVO createReqVO) { return success(doctornoticeService.createDoctornotice(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新医生通知") - @PreAuthorize("@ss.hasPermission('system:doctornotice:update')") public CommonResult updateDoctornotice(@Valid @RequestBody DoctornoticeSaveReqVO updateReqVO) { doctornoticeService.updateDoctornotice(updateReqVO); return success(true); @@ -56,7 +54,6 @@ public class DoctornoticeController { @DeleteMapping("/delete") @Operation(summary = "删除医生通知") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('system:doctornotice:delete')") public CommonResult deleteDoctornotice(@RequestParam("id") Integer id) { doctornoticeService.deleteDoctornotice(id); return success(true); @@ -65,7 +62,6 @@ public class DoctornoticeController { @GetMapping("/get") @Operation(summary = "获得医生通知") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:doctornotice:query')") public CommonResult getDoctornotice(@RequestParam("id") Integer id) { DoctornoticeDO doctornotice = doctornoticeService.getDoctornotice(id); return success(BeanUtils.toBean(doctornotice, DoctornoticeRespVO.class)); @@ -73,7 +69,6 @@ public class DoctornoticeController { @GetMapping("/page") @Operation(summary = "获得医生通知分页") - @PreAuthorize("@ss.hasPermission('system:doctornotice:query')") public CommonResult> getDoctornoticePage(@Valid DoctornoticePageReqVO pageReqVO) { PageResult pageResult = doctornoticeService.getDoctornoticePage(pageReqVO); return success(BeanUtils.toBean(pageResult, DoctornoticeRespVO.class)); @@ -81,7 +76,6 @@ public class DoctornoticeController { @GetMapping("/export-excel") @Operation(summary = "导出医生通知 Excel") - @PreAuthorize("@ss.hasPermission('system:doctornotice:export')") @ApiAccessLog(operateType = EXPORT) public void exportDoctornoticeExcel(@Valid DoctornoticePageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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 83ffe4d6f9..0f83ddf51e 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 @@ -40,14 +40,12 @@ public class EcgdataController { @PostMapping("/create") @Operation(summary = "创建心电数据采集") - @PreAuthorize("@ss.hasPermission('system:ecgdata:create')") public CommonResult createEcgdata(@Valid @RequestBody EcgdataSaveReqVO createReqVO) { return success(ecgdataService.createEcgdata(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新心电数据采集") - @PreAuthorize("@ss.hasPermission('system:ecgdata:update')") public CommonResult updateEcgdata(@Valid @RequestBody EcgdataSaveReqVO updateReqVO) { ecgdataService.updateEcgdata(updateReqVO); return success(true); @@ -56,7 +54,6 @@ public class EcgdataController { @DeleteMapping("/delete") @Operation(summary = "删除心电数据采集") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('system:ecgdata:delete')") public CommonResult deleteEcgdata(@RequestParam("id") Integer id) { ecgdataService.deleteEcgdata(id); return success(true); @@ -65,7 +62,6 @@ public class EcgdataController { @GetMapping("/get") @Operation(summary = "获得心电数据采集") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:ecgdata:query')") public CommonResult getEcgdata(@RequestParam("id") Integer id) { EcgdataDO ecgdata = ecgdataService.getEcgdata(id); return success(BeanUtils.toBean(ecgdata, EcgdataRespVO.class)); @@ -73,7 +69,6 @@ public class EcgdataController { @GetMapping("/page") @Operation(summary = "获得心电数据采集分页") - @PreAuthorize("@ss.hasPermission('system:ecgdata:query')") public CommonResult> getEcgdataPage(@Valid EcgdataPageReqVO pageReqVO) { PageResult pageResult = ecgdataService.getEcgdataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, EcgdataRespVO.class)); @@ -81,7 +76,6 @@ public class EcgdataController { @GetMapping("/export-excel") @Operation(summary = "导出心电数据采集 Excel") - @PreAuthorize("@ss.hasPermission('system:ecgdata:export')") @ApiAccessLog(operateType = EXPORT) public void exportEcgdataExcel(@Valid EcgdataPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java index c815057dd5..cd8779c496 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java @@ -30,50 +30,62 @@ public class DeviceDO extends BaseDO { /** * 设备名称 */ + @TableField("devicename") private String devicename; /** * 设备ID/编号 */ + @TableField("devicecode") private String devicecode; /** * 设备类型 */ + @TableField("devicetype") private String devicetype; /** * 设备位置 */ + @TableField("location") private String location; /** * 设备状态(0:待激活 1 在线 2 离线 ,3 禁用 ) */ + @TableField("devicestatus") private Integer devicestatus; /** * 机构ID */ + @TableField("orgid") private Integer orgid; /** * 机构名称 */ + @TableField("orgname") private String orgname; /** * 设备描述 */ + @TableField("description") private String description; /** * 创建时间 */ + @TableField("createtime") private LocalDateTime createtime; /** * 更新时间 */ + @TableField("updatetime") private LocalDateTime updatetime; /** * 创建人 */ + @TableField("createby") private String createby; /** * 更新人 */ + @TableField("updateby") private String updateby; } \ 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 f7f45fbca6..ce7f26b090 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 @@ -30,30 +30,37 @@ public class DeviceuserDO extends BaseDO { /** * 设备ID */ + @TableField("deviceid") private Integer deviceid; /** * 用户ID */ + @TableField("userid") private Integer userid; /** * 创建时间 */ + @TableField("createtime") private LocalDateTime createtime; /** * 更新时间 */ + @TableField("updatetime") private LocalDateTime updatetime; /** * 创建人 */ + @TableField("createby") private String createby; /** * 更新人 */ + @TableField("updateby") private String updateby; /** * 用户姓名 */ + @TableField("username") private String username; } \ 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/doctornotice/DoctornoticeDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java index 13ef301255..f2f8bafee5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/doctornotice/DoctornoticeDO.java @@ -32,62 +32,77 @@ public class DoctornoticeDO extends BaseDO { /** * 设备ID */ + @TableField("deviceid") private Integer deviceid; /** * 接收通知的用户ID */ + @TableField("userid") private Integer userid; /** * 发送通知的医生ID */ + @TableField("doctorid") private Integer doctorid; /** * 发送时间 */ + @TableField("datatime") private LocalDateTime datatime; /** * 通知类型(1:异常提醒,2:建议提醒,3:复查提醒) */ + @TableField("noticetype") private Integer noticetype; /** * 通知标题 */ + @TableField("noticetitle") private String noticetitle; /** * 通知内容 */ + @TableField("noticecontent") private String noticecontent; /** * 通知级别(1:普通,2:重要,3:紧急) */ + @TableField("noticelevel") private Integer noticelevel; /** * 读取状态(0:未读,1:已读) */ + @TableField("readstatus") private Integer readstatus; /** * 读取时间 */ + @TableField("readtime") private LocalDateTime readtime; /** * 创建时间 */ + @TableField("createtime") private LocalDateTime createtime; /** * 更新时间 */ + @TableField("updatetime") private LocalDateTime updatetime; /** * 创建人 */ + @TableField("createby") private String createby; /** * 更新人 */ + @TableField("updateby") private String updateby; /** * 是否删除(0:未删除,1:已删除) */ + @TableField("isdeleted") private Integer isdeleted; } \ 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 ab78d3332b..45cc974e82 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 @@ -32,106 +32,132 @@ public class EcgdataDO extends BaseDO { /** * 设备ID */ + @TableField("deviceid") private Integer deviceid; /** * 设备名称 */ + @TableField("devicename") private String devicename; /** * 人员ID */ + @TableField("userid") private Integer userid; /** * 采集时间 */ + @TableField("collecttime") private LocalDateTime collecttime; /** * 设备类型 */ + @TableField("devicetype") private String devicetype; /** * 心率(次/分) */ + @TableField("heartrate") private Integer heartrate; /** * 心律类型(窦性心律,房颤等) */ + @TableField("rhythm") private String rhythm; /** * PR间期(ms) */ + @TableField("printerval") private Integer printerval; /** * QRS时限(ms) */ + @TableField("qrsduration") private Integer qrsduration; /** * QT间期(ms) */ + @TableField("qtinterval") private Integer qtinterval; /** * QTc间期(ms) */ + @TableField("qtcinterval") private Integer qtcinterval; /** * P电轴(度) */ + @TableField("paxis") private Integer paxis; /** * QRS电轴(度) */ + @TableField("qrsaxis") private Integer qrsaxis; /** * T电轴(度) */ + @TableField("taxis") private Integer taxis; /** * RV5电压(mV) */ + @TableField("rv5") private BigDecimal rv5; /** * SV1电压(mV) */ + @TableField("sv1") private BigDecimal sv1; /** * RV5+SV1电压(mV) */ + @TableField("rv5sv1") private BigDecimal rv5sv1; /** * ST段改变 */ + @TableField("stsegment") private String stsegment; /** * T波改变 */ + @TableField("twave") private String twave; /** * 心电图诊断 */ + @TableField("diagnosis") private String diagnosis; /** * 心电图图片地址 */ + @TableField("ecgimageurl") private String ecgimageurl; /** * 心电图数据文件地址 */ + @TableField("ecgdataurl") private String ecgdataurl; /** * 机构ID */ + @TableField("orgid") private Integer orgid; /** * 机构名称 */ + @TableField("orgname") private String orgname; /** * 数据状态(0:异常,1:正常) */ + @TableField("datastatus") private Integer datastatus; /** * 备注 */ + @TableField("remark") private String remark; } \ No newline at end of file