Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/alarm/vo/IotAlarmSettingPageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.pms.controller.admin.alarm.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -40,4 +42,9 @@ public class IotAlarmSettingPageReqVO extends PageParam {
     @Schema(description = "告警属性")
     private Integer alarmProperty;
 
+    @Schema(description = "y轴最大值")
+    private String axisMax;
+
+    @Schema(description = "y轴最小值")
+    private String axisMin;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/alarm/vo/IotAlarmSettingRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.alarm.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 告警设置 Response VO")
 @Data
@@ -50,4 +50,10 @@ public class IotAlarmSettingRespVO {
 
     @Schema(description = "属性标识")
     private String propertyCode;
+
+    @Schema(description = "y轴最大值")
+    private String axisMax;
+
+    @Schema(description = "y轴最小值")
+    private String axisMin;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/alarm/vo/IotAlarmSettingSaveReqVO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.pms.controller.admin.alarm.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
 
 @Schema(description = "管理后台 - 告警设置新增/修改 Request VO")
 @Data
@@ -39,4 +39,10 @@ public class IotAlarmSettingSaveReqVO {
     @Schema(description = "属性标识")
     @NotEmpty(message = "属性标识不能为空")
     private String propertyCode;
+
+    @Schema(description = "y轴最大值")
+    private String axisMax;
+
+    @Schema(description = "y轴最小值")
+    private String axisMin;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/alarm/IotAlarmSettingDO.java

@@ -1,11 +1,10 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.alarm;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 
 /**
  * 告警设置 DO
@@ -60,4 +59,13 @@ public class IotAlarmSettingDO extends BaseDO {
      * 属性标识
      */
     private String propertyCode;
+
+    /**
+     * y轴最大值
+     */
+    private String axisMax;
+    /**
+     * y轴最小是
+     */
+    private String axisMin;
 }