新增 设备新增 snr、rssi、rsrq、rsrp字段

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

@@ -187,6 +187,11 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
         this.setElectricQuantity(items.getInteger(PumpParams.electricQuantity));
         this.setRunState(DeviceRunStatusUtils.getRunStatus(items.getInteger(PumpParams.runStatus)));
         this.setAlarm(DeviceAlarmUtils.getAlarm(Optional.ofNullable(items.getInteger(PumpParams.alarmStatus)).orElse(0)));
+
+        this.setSnr(items.getInteger(PumpParams.snr));
+        this.setRssi(items.getInteger(PumpParams.rssi));
+        this.setRsrq(items.getInteger(PumpParams.rsrq));
+        this.setRsrp(items.getInteger(PumpParams.rsrp));
         // 预报
         // 镇痛不足预报 此报警不从设备接收
 //        this.setWarnAnalgesicPoor(Optional.ofNullable(items.getBoolean(PumpParams.warnAnalgesicPoor)).orElse(false));

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

@@ -151,6 +151,18 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
     private Integer electricQuantity;
 
 
+    @ApiModelProperty("信噪比")
+    private Integer snr;
+
+    @ApiModelProperty("信号强度")
+    private Integer rssi;
+
+    @ApiModelProperty("参考信号接收质量")
+    private Integer rsrq;
+
+    @ApiModelProperty("參考信号接收功率")
+    private Integer rsrp;
+
     public Integer getPcaTotalCount() {
         return getPcaInvalidCount()+getPcaValidCount();
     }

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

@@ -51,6 +51,10 @@ public enum PumpParams {
     minFlow("minFlow","减档下限"),
     maxFlow("maxFlow","加档上限"),
 
+    snr("snr","信噪比"),
+    rssi("rssi","信号强度"),
+    rsrq("rsrq","参考信号接收质量"),
+    rsrp("rsrp","參考信号接收功率"),
 
 
     dataType("dataType","数据类型，1、业务数据 2、测试数据"),