修改

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数据不存在");
+
 }

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<Integer> createDeviceuser(@Valid @RequestBody DeviceuserSaveReqVO createReqVO) {
         return success(deviceuserService.createDeviceuser(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新设备人员关联")
-    @PreAuthorize("@ss.hasPermission('system:deviceuser:update')")
     public CommonResult<Boolean> 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<Boolean> 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<DeviceuserRespVO> 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<PageResult<DeviceuserRespVO>> getDeviceuserPage(@Valid DeviceuserPageReqVO pageReqVO) {
         PageResult<DeviceuserDO> 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 {

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<Integer> createDoctornotice(@Valid @RequestBody DoctornoticeSaveReqVO createReqVO) {
         return success(doctornoticeService.createDoctornotice(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新医生通知")
-    @PreAuthorize("@ss.hasPermission('system:doctornotice:update')")
     public CommonResult<Boolean> 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<Boolean> 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<DoctornoticeRespVO> 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<PageResult<DoctornoticeRespVO>> getDoctornoticePage(@Valid DoctornoticePageReqVO pageReqVO) {
         PageResult<DoctornoticeDO> 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 {

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<Integer> createEcgdata(@Valid @RequestBody EcgdataSaveReqVO createReqVO) {
         return success(ecgdataService.createEcgdata(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新心电数据采集")
-    @PreAuthorize("@ss.hasPermission('system:ecgdata:update')")
     public CommonResult<Boolean> 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<Boolean> 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<EcgdataRespVO> 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<PageResult<EcgdataRespVO>> getEcgdataPage(@Valid EcgdataPageReqVO pageReqVO) {
         PageResult<EcgdataDO> 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 {

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;
 
 }

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;
 
 }

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;
 
 }

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;
 
 }