增加设备配置中 库存预警 字段

device-api-service/src/main/java/com/xy/entity/DeviceConfig.java

@@ -1,8 +1,5 @@
 package com.xy.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 设备配置表
@@ -42,5 +42,11 @@ public class DeviceConfig implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateTime;
 
+    @ApiModelProperty(value = "缺货率预警值")
+    private Integer stockOutRate;
+
+    @ApiModelProperty(value = "缺货种类预警值")
+    private Integer stockOutGoodsNum;
+
 
 }

device-api-service/src/main/java/com/xy/service/DeviceConfigServiceImpl.java

@@ -33,11 +33,11 @@ import java.util.Map;
  */
 @Service
 @AllArgsConstructor
-@Api(tags = "设备温度告警设置")
+@Api(tags = "设备配置表")
 public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, DeviceConfig> implements DeviceConfigService {
 
     @PostMapping("update")
-    @ApiOperation("设备温度告警阈值设置")
+    @ApiOperation("修改")
     public R update(@RequestBody @Validated DeviceConfigDto.Update update) {
         DeviceConfig deviceConfigInfo = getById(update.getDeviceId());
         LocalDateTime now = LocalDateTime.now();
@@ -51,7 +51,7 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
     }
 
     @PostMapping("batchUpdate")
-    @ApiOperation("设备温度告警阈值批量设置")
+    @ApiOperation("批量更新")
     public R batchUpdate(@RequestBody @Validated DeviceConfigDto.BatchUpdate batchUpdate) {
         List<Long> deviceIds = batchUpdate.getDeviceIds();
         List<DeviceConfig> deviceConfigs = this.listByIds(deviceIds);
@@ -59,6 +59,8 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
             deviceConfigs.forEach(d -> {
                 d.setTempMin(batchUpdate.getTempMin());
                 d.setTempMax(batchUpdate.getTempMax());
+                d.setStockOutGoodsNum(batchUpdate.getStockOutGoodsNum());
+                d.setStockOutRate(batchUpdate.getStockOutRate());
                 d.setUpdateTime(LocalDateTime.now());
             });
             this.saveOrUpdateBatch(deviceConfigs);

device-api/src/main/java/com/xy/dto/DeviceConfigDto.java

@@ -28,14 +28,18 @@ public class DeviceConfigDto {
         @ApiModelProperty(value = "设备id")
         private Long deviceId;
 
-        @NotNull(message = "最大温度告警值不能为空")
         @ApiModelProperty(value = "最大温度告警值")
         private Integer tempMax;
 
-        @NotNull(message = "最小温度告警值不能为空")
         @ApiModelProperty(value = "最小温度告警值")
         private Integer tempMin;
 
+        @ApiModelProperty(value = "缺货率预警值")
+        private Integer stockOutRate;
+
+        @ApiModelProperty(value = "缺货种类预警值")
+        private Integer stockOutGoodsNum;
+
     }
 
     @Data
@@ -46,14 +50,18 @@ public class DeviceConfigDto {
         @ApiModelProperty(value = "设备id")
         private List<Long> deviceIds;
 
-        @NotNull(message = "最大温度告警值不能为空")
         @ApiModelProperty(value = "最大温度告警值")
         private Integer tempMax;
 
-        @NotNull(message = "最小温度告警值不能为空")
         @ApiModelProperty(value = "最小温度告警值")
         private Integer tempMin;
 
+        @ApiModelProperty(value = "缺货率预警值")
+        private Integer stockOutRate;
+
+        @ApiModelProperty(value = "缺货种类预警值")
+        private Integer stockOutGoodsNum;
+
     }
 
     @Data
@@ -87,6 +95,11 @@ public class DeviceConfigDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
+        @ApiModelProperty(value = "缺货率预警值")
+        private Integer stockOutRate;
+
+        @ApiModelProperty(value = "缺货种类预警值")
+        private Integer stockOutGoodsNum;
     }
 
 }