add

添加重设参数值

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

@@ -27,7 +27,7 @@ import java.util.*;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName(value = "bus_clinic",autoResultMap = true)
-@ApiModel(value="病人临床手术信息", description="病人临git床手术信息实体类")
+@ApiModel(value="病人临床手术信息", description="病人临床手术信息实体类")
 @ToString
 public class BusClinicEntity extends TenantGenericEntity<String,String> {
 

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

@@ -34,7 +34,6 @@ import java.util.Date;
 @ApiModel(value="设备报警信息", description="设备报警信息记录")
 @ToString
 public class BusDeviceAlarmEntity extends TenantGenericEntity<String,String> {
-    private final static MD5 md5=MD5.create();
     @ApiModelProperty(value = "设备唯一编码",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     @NotNull(groups = Insert.class,message = "设备唯一标识不能为空")
     private String deviceId;
@@ -137,7 +136,8 @@ public class BusDeviceAlarmEntity extends TenantGenericEntity<String,String> {
         param.putOpt("warnAnalgesicPoor",String.valueOf(this.getWarnAnalgesicPoor()));
         param.putOpt("warnLowBattery",String.valueOf(this.getWarnLowBattery()));
         param.putOpt("warnFlow",String.valueOf(this.getWarnFlow()));
-        return md5.digestHex16(param.toString());
+        MD5 md5=MD5.create();
+        return md5.digestHex(param.toString());
     }
 
     public static boolean alarmOrWarn(CommonDeviceParam history){

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

@@ -1,9 +1,9 @@
 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.*;
@@ -209,6 +209,8 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
         // 输液将结束预报
         this.setWarnWillFinished(Optional.ofNullable(items.getBoolean(PumpParams.warnWillFinished)).orElse(false));
 
+        this.setResetParams(ObjectUtil.equal(items.getInteger(PumpParams.resetParams),1));
+
         // 设置脉冲泵参数
         if (this.getType() == DeviceTypeEnum.pulse){
             // 脉冲锁时
@@ -236,6 +238,29 @@ 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));
+        }
+
+        //设置阻塞
+        this.setBlock1(items.getInteger(PumpParams.block1));
+        this.setBlock2(items.getInteger(PumpParams.block2));
+
+        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/CommonDeviceParam.java

@@ -8,6 +8,7 @@ import com.nb.web.api.enums.DeviceAlarmEnum;
 import com.nb.web.api.enums.DeviceStatusEnum;
 import com.nb.web.api.enums.FlowStatusEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -19,38 +20,40 @@ import lombok.Data;
  * @createTime 2022年05月05日 20:51:00
  */
 @Data
+@ApiModel("设备公共参数信息")
 public class CommonDeviceParam<K,T>  extends DeviceProperties<K,T>  {
 
-    @ApiModelProperty(value = "泵运行状态",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "泵运行状态")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private DeviceStatusEnum runState;
 
-    @ApiModelProperty(value = "报警信息",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "报警信息")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private DeviceAlarmEnum alarm;
 
-    @ApiModelProperty(value = "输注即将结束提醒",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "输注即将结束提醒")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    @JsonIgnore
     private Boolean warnWillFinished;
 
-    @ApiModelProperty(value = "镇痛不足提醒",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "镇痛不足提醒",hidden = true)
 //    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @JsonIgnore
     private Boolean warnAnalgesicPoor;
 
-    @ApiModelProperty(value = "电量偏低提醒",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "电量偏低提醒")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    @JsonIgnore
     private Boolean warnLowBattery;
 
-    @ApiModelProperty(value = "加减档提示",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+    @ApiModelProperty(value = "加减档提示")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    @JsonIgnore
     private FlowStatusEnum warnFlow;
 
+    @ApiModelProperty("是否重设参数")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Boolean resetParams;
+
     @TableField(exist = false)
-    @ApiModelProperty("提醒字段")
+    @ApiModelProperty(value = "提醒字段",hidden = true)
     private String warns;
 
     private void judgeWarnWillFinished() {
@@ -97,8 +100,20 @@ public class CommonDeviceParam<K,T>  extends DeviceProperties<K,T>  {
         }
     }
 
+    private void judgeResetParams() {
+        if(!Boolean.TRUE.equals(this.resetParams)){
+            return;
+        }
+        if (CharSequenceUtil.isEmpty(this.warns)) {
+            this.warns="重设参数;";
+        }else {
+            this.warns=this.warns+"重设参数;";
+        }
+    }
+
     public void handleWarn(){
         judgeWarnAnalgesicPoor();
+        judgeResetParams();
         judgeWarnFlow();
         judgeWarnLowBattery();
         judgeWarnWillFinished();

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,24 @@ 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;
+
+    @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/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/enums/FlowStatusEnum.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+
 /**
  * @Author 龙三郎
  * @Date 2022-04-26 09:28:34

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IDeviceAlarmClient.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.api.entity.BusDeviceAlarmEntity;
 import com.nb.web.api.feign.query.AlarmQuery;
 
+import java.util.Date;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -21,4 +23,11 @@ public interface IDeviceAlarmClient {
      * @return IPage
      */
     IPage<BusDeviceAlarmEntity> pageQuery(AlarmQuery query);
+
+    /**
+     * 查询从某一时间段开始后的报警数量
+     * @param startTime
+     * @return
+     */
+    Long count(String tenantId, Date startTime);
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IHospitalClient.java

@@ -18,6 +18,4 @@ public interface IHospitalClient {
      * @return List<HospitalResult>
      */
     List<HospitalResult> selectAll();
-
-    HospitalResult findById(String tenantId);
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/query/PatientMonitorQuery.java

@@ -1,6 +1,8 @@
 package com.nb.web.api.feign.query;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.nb.web.api.enums.DeviceAlarmEnum;
 import com.nb.web.api.enums.DeviceTypeEnum;
 import com.nb.web.api.enums.DeviceStatusEnum;
@@ -41,6 +43,8 @@ public class PatientMonitorQuery  implements Serializable {
     @ApiModelProperty("WEB端请传输blurry-设备号")
     private String deviceId;
 
+    private Collection<String> deviceIds;
+
     @ApiModelProperty("WEB端请传输blurry-设备别名")
     private String deviceAlias;
 
@@ -140,6 +144,7 @@ public class PatientMonitorQuery  implements Serializable {
 
 
     public void setBlurry(String blurry){
+        this.blurry=blurry;
         this.setBedNo(blurry);
         this.setName(blurry);
         this.setCode(blurry);

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/result/HospitalResult.java

@@ -1,7 +1,6 @@
 package com.nb.web.api.feign.result;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,10 +28,6 @@ public class HospitalResult implements Serializable {
     @Length(max = 255,message = "区域编码名称长度不得超过255个字节")
     private String areaCode;
 
-    @ApiModelProperty("医院唯一编码,自动生成")
-    @JsonIgnoreProperties(allowGetters = true)
-    private String code;
-
     /**
      * 医院地址
      */

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/result/PatientMonitorResult.java

@@ -173,7 +173,7 @@ public class PatientMonitorResult implements Serializable {
 
     @ApiModelProperty(value = "当前病人是否已结束临床，根据此参数+监护开始时间计算总监护时间",
             notes = "false:监护时长=当前时间-监护开始时间 ,true:监护时长=监护结束时间-监护开始时间")
-    private boolean clinicFinished;
+    private Boolean clinicFinished;
 
     @ApiModelProperty("当前病人监护结束时间")
     private Date monitorEndTime;
@@ -209,6 +209,16 @@ public class PatientMonitorResult implements Serializable {
     @ApiModelProperty("最后上传时间")
     private Date lastUploadTime;
 
+
+    @ApiModelProperty("运行时电机的压力值")
+    private Integer block1;
+
+    @ApiModelProperty("非运行时电机的压力值")
+    private Integer block2;
+
+    @ApiModelProperty("阻塞状态")
+    private BlockStatusEnum blockStatus;
+
     private void judgeWarnWillFinished() {
         if(!Boolean.TRUE.equals(this.warnWillFinished)){
            return;

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

@@ -60,6 +60,14 @@ public enum PumpParams {
     dataType("dataType","数据类型，1、业务数据 2、测试数据"),
 
     CRC("CRC","CRC"),
+    //阻塞值
+    block1("block1","运行时电机的压力值"),
+    block2("block2","非运行时的电机压力值"),
+
+    //阻塞值
+    eveningTime1("eveningTime1","夜间减档开始时间"),
+    eveningTime2("eveningTime2","夜间减档结束时间"),
+    nightRatio("nightRatio","夜间减档比例"),
 
     userId("userId","医院编码");
 

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

@@ -10,7 +10,7 @@ import com.nb.web.api.enums.FlowStatusEnum;
  */
 public class WarnFlowUtils {
     public static FlowStatusEnum getAlarm(Integer i){
-        if(i==null){
+        if(i== null){
             return FlowStatusEnum.None;
         }
         if (i == 0){