add

添加阻塞值

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

@@ -2,8 +2,10 @@ 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;
+import com.nb.web.api.enums.BlockStatusEnum;
 import com.nb.web.api.enums.DeviceTypeEnum;
 import com.nb.core.enums.SexEnum;
 import com.fasterxml.jackson.annotation.*;
@@ -238,6 +240,21 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
             this.setWarnFlow(WarnFlowUtils.getAlarm(items.getInteger(PumpParams.warnFlow)));
         }
 
+        //设置阻塞
+        this.setBlock1(items.getInteger(PumpParams.maxFlow));
+        this.setBlock2(items.getInteger(PumpParams.maxFlow));
+
+        if(ObjectUtil.isNotNull(this.getBlock1())&&ObjectUtil.isNotNull(this.getBlock2())){
+            int abs = Math.abs(this.getBlock1() - this.getBlock2());
+            if(abs>5){
+                this.setBlockStatus(BlockStatusEnum.UNNORMAL);
+            }else {
+                this.setBlockStatus(BlockStatusEnum.NORMAL);
+            }
+        }else {
+            this.setBlockStatus(BlockStatusEnum.NONE);
+        }
+
         this.setUserId(items.getStringReturnDefault(PumpParams.userId,null));
     }
 

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

@@ -2,6 +2,7 @@ package com.nb.web.api.entity.common;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.nb.web.api.enums.BlockStatusEnum;
 import com.nb.web.api.enums.DeviceTypeEnum;
 import com.nb.core.entity.TenantGenericEntity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -163,6 +164,15 @@ public class DeviceProperties<K,T>  extends TenantGenericEntity<K,T> {
     @ApiModelProperty("參考信号接收功率")
     private Integer rsrp;
 
+    @ApiModelProperty("运行时电机的压力值")
+    private Integer block1;
+
+    @ApiModelProperty("非运行时电机的压力值")
+    private Integer block2;
+
+    @ApiModelProperty("阻塞状态")
+    private BlockStatusEnum blockStatus;
+
     public Integer getPcaTotalCount() {
         return getPcaInvalidCount()+getPcaValidCount();
     }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/BlockStatusEnum.java

@@ -0,0 +1,32 @@
+package com.nb.web.api.enums;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName AppArticleEnum.java
+ * @Description app宣教文章类型
+ * @createTime 2022年08月10日 16:13:00
+ */
+@AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum BlockStatusEnum implements IEnum<Integer> {
+    NONE(0,"未上传数据"),
+    NORMAL(1,"数据正常"),
+    UNNORMAL(2,"数据一厂");
+    ;
+    /**
+     * 与枚举ordinal保持一致
+     */
+    @Getter
+    @ApiModelProperty("运行状态编码")
+    private Integer value;
+    @Getter
+    @ApiModelProperty("运行状态内容")
+    private String text;
+    }

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

@@ -60,6 +60,9 @@ public enum PumpParams {
     dataType("dataType","数据类型，1、业务数据 2、测试数据"),
 
     CRC("CRC","CRC"),
+    //阻塞值
+    block1("block1","运行时电机的压力值"),
+    block2("block2","非运行时的电机压力值"),
 
     userId("userId","医院编码");
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicStatsQueryResult.java

@@ -39,6 +39,10 @@ public class ClinicStatsQueryResult implements Serializable {
     private Integer rsrq;
     @ApiModelProperty(value = "参考信号接收功率",hidden = true)
     private Integer rsrp;
+    @ApiModelProperty(value = "运行时电机的压力值",hidden = true)
+    private Integer block1;
+    @ApiModelProperty(value = "非运行时电机的压力值",hidden = true)
+    private Integer block2;
     @ApiModelProperty(value = "数据上传时间",hidden = true)
     private Date uploadTime;
     @ApiModelProperty(hidden = true)

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicStatsReturnResult.java

@@ -49,6 +49,10 @@ public class ClinicStatsReturnResult implements Serializable {
     private List<Integer> rsrq;
     @ApiModelProperty(value = "参考信号接收功率数据集",hidden = true)
     private List<Integer> rsrp;
+    @ApiModelProperty(value = "运行时电机压力值数据集",hidden = true)
+    private List<Integer> block1;
+    @ApiModelProperty(value = "非运行时电机压力值数据集",hidden = true)
+    private List<Integer> block2;
     @ApiModelProperty("上传时间")
     private List<String> uploadTimes;
 
@@ -106,6 +110,9 @@ public class ClinicStatsReturnResult implements Serializable {
             List<Integer> rsrqCounts = Optional.ofNullable(result.getRsrq()).orElse(new ArrayList<>());
             List<Integer> rsrpCounts = Optional.ofNullable(result.getRsrp()).orElse(new ArrayList<>());
 
+            List<Integer> block1Counts = Optional.ofNullable(result.getRsrq()).orElse(new ArrayList<>());
+            List<Integer> block2Counts = Optional.ofNullable(result.getRsrp()).orElse(new ArrayList<>());
+
             BigDecimal appendDose = queryResult.getAppendDose()!=null?queryResult.getAppendDose():BigDecimal.ZERO;
             if(!ObjectUtil.equal(lastInfusionId,queryResult.getInfusionId())){
                 lastInfusionId=queryResult.getInfusionId();
@@ -146,11 +153,12 @@ public class ClinicStatsReturnResult implements Serializable {
             result.setInValidCount(inValidCounts);
             result.setUploadTimes(uploadTimes);
             result.setSingleAppendDose(singleAppendDoses);
-
             result.setSnr(snrCounts);
             result.setRssi(rssiCounts);
             result.setRsrp(rsrpCounts);
             result.setRsrq(rsrqCounts);
+            result.setBlock1(block1Counts);
+            result.setBlock2(block2Counts);
             lastValidPcaCount=queryResult.getValidCount();
         };
         result.setXAxisScales(axisScales);

nb-service/web-service/src/main/resources/mapper/bus/BusClinicMapper.xml

@@ -12,6 +12,8 @@
         <result column="upload_time" property="uploadTime"/>
         <result column="infusion_id" property="infusionId"/>
         <result column="electric_quantity" property="electricQuantity"/>
+        <result column="block1" property="block1"/>
+        <result column="block2" property="block2"/>
     </resultMap>
 
     <resultMap id="queryResult" type="com.nb.web.service.bus.service.dto.ClinicResult">
@@ -70,6 +72,8 @@
         <if test="query.rsrp!=false">
             h.rsrp as rsrp,
         </if>
+        h.block1 as block1,
+        h.block2 as block2,
         h.upload_time,
         h.infusion_id
         FROM