预警告警

bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java

@@ -81,7 +81,7 @@ public class TbDevAttributeController extends BaseController {
      * @return
      */
     @PostMapping("/handle")
-    public AjaxResult approve(TbDevAttribute handle) {
+    public AjaxResult approve(@RequestBody TbDevAttribute handle) {
         return tbDevAttributeService.handle(handle);
     }
 

bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java

@@ -6,11 +6,13 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.Size;
 import lombok.Data;
+import org.springframework.stereotype.Repository;
 
 /**
  * 设备监测信息表
  * @author syruan
  */
+
 @ApiModel(description="设备监测信息表")
 @Data
 public class TbDevAttribute implements Serializable {

bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java

@@ -3,12 +3,14 @@ package com.bonus.base.vo;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.stereotype.Repository;
 
 
 /**
  * @Author ma_sh
  * @create 2024/9/19 19:52
  */
+
 @Data
 public class TbDevAttributeVo {
 

bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml

@@ -249,7 +249,8 @@
 
   <select id="getAll" resultType="com.bonus.base.domain.TbBdDeviceRecord">
     select
-    tbdr.id, tbdr.record_id, tbdr.dev_name, tbdr.dev_code, tbdr.unit_name, tbdr.area_name, tbdr.dev_user, tbdr.dev_user_phone,
+    tbdr.id as id, tbdr.record_id as recordId, tbdr.dev_name as devName, tbdr.dev_code as devCode, tbdr.unit_name as unitName, tbdr.area_name as areaName,
+    tbdr.dev_user as devUser, tbdr.dev_user_phone as devUserPhone,
     tbr.audit_user as auditUser, tbr.audit_time as auditTime, su.nick_name as auditUserName
     from tb_bd_device_record tbdr
     left join tb_bd_record tbr on tbdr.record_id = tbr.id

bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml

@@ -31,7 +31,7 @@
     select tda.id as id,
            tda.dev_id as devId,
            td.dev_type as devType,
-           sda.dict_label as devTypeName,
+           sdd.dict_label as devTypeName,
            td.dev_code as devCode,
            td.dev_name as devName,
            tda.jc_name as jcName,