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