diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java index ce03afc..3e3d7ec 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbDevAttributeController.java +++ b/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); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java index 45914fe..05e59d5 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java @@ -149,4 +149,4 @@ public class TbBdRecord implements Serializable { private List recordList; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java index a68d762..dfc4058 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevAttribute.java +++ b/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 { @@ -102,4 +104,4 @@ public class TbDevAttribute implements Serializable { private String endTime; private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java index 2933b69..5c540f7 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/vo/TbDevAttributeVo.java +++ b/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 { diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml index 48ea6eb..d382a79 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml @@ -19,7 +19,7 @@ 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 @@ -260,4 +261,4 @@ and tbdr.record_id = #{recordId} - \ No newline at end of file + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml index a3469eb..a24d996 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdRecordMapper.xml @@ -24,7 +24,7 @@ - id, depart_id, depart_name, pro_id, pro_name, rel_user, rel_phone, del_flag, audit_status, + id, depart_id, depart_name, pro_id, pro_name, rel_user, rel_phone, del_flag, audit_status, remarks, create_time, create_user, update_time, update_user, audit_user, audit_time @@ -221,4 +221,4 @@ - \ No newline at end of file + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml index 34af83f..038c929 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbDevAttributeMapper.xml @@ -21,7 +21,7 @@