add

添加阻塞值

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/BusDeviceRunningEntity.java

@@ -1,7 +1,5 @@
 package com.nb.web.api.entity.common;
 
-
-
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -238,6 +236,14 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
 
             // 加减档预报
             this.setWarnFlow(WarnFlowUtils.getAlarm(items.getInteger(PumpParams.warnFlow)));
+
+
+            //夜间减档开始时间
+            this.setEveningTime1(items.getInteger(PumpParams.eveningTime1));
+            //夜间减档结束时间
+            this.setEveningTime2(items.getInteger(PumpParams.eveningTime2));
+            //夜间减档比例
+            this.setNightRatio(items.getInteger(PumpParams.nightRatio));
         }
 
         //设置阻塞

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/CommonDeviceParam.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+
 /**
  * @author lifang
  * @version 1.0.0

nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/DeviceProperties.java

@@ -173,6 +173,15 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
     @ApiModelProperty("阻塞状态")
     private BlockStatusEnum blockStatus;
 
+    @ApiModelProperty("夜间减档开始时间")
+    private Integer eveningTime1;
+
+    @ApiModelProperty("夜间减档结束时间")
+    private Integer eveningTime2;
+
+    @ApiModelProperty("夜间减档比例")
+    private Integer nightRatio;
+
     public Integer getPcaTotalCount() {
         return getPcaInvalidCount()+getPcaValidCount();
     }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/utils/PumpParams.java

@@ -64,6 +64,11 @@ public enum PumpParams {
     block1("block1","运行时电机的压力值"),
     block2("block2","非运行时的电机压力值"),
 
+    //阻塞值
+    eveningTime1("eveningTime1","夜间减档开始时间"),
+    eveningTime2("eveningTime2","夜间减档结束时间"),
+    nightRatio("nightRatio","夜间减档比例"),
+
     userId("userId","医院编码");