Commit d09ac086 LN

设备提示消息延迟显示2分钟

1 个父辈 3a1b910f
...@@ -169,6 +169,12 @@ public class StatusBean { ...@@ -169,6 +169,12 @@ public class StatusBean {
} }
/** /**
* 提示信息是否超时(2分钟)提示信息默认十分钟后不再显示
* @return
*/
public boolean msgTimeOut(){return (System.currentTimeMillis()-lastSaveTime)>(2*60*1000);}
/**
* 获取客户端发送上来的二维码 * 获取客户端发送上来的二维码
*/ */
public String getCode(){ public String getCode(){
......
...@@ -724,9 +724,9 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -724,9 +724,9 @@ public class BaseDeviceHandler implements IDeviceHandler {
String msgEn = statusBean.getMsgEn(); String msgEn = statusBean.getMsgEn();
String msgCode = statusBean.getMsgCode(); String msgCode = statusBean.getMsgCode();
// if(ObjectUtil.isNotEmpty(msg)||ObjectUtil.isNotEmpty(msgCode)){ if(ObjectUtil.isNotEmpty(msg)||ObjectUtil.isNotEmpty(msgCode)) {
DevicesStatusUtil.updateClientMsg(statusBean.getCid(), msgCode, msg, msgEn, statusBean.getMsgParam()); DevicesStatusUtil.updateClientMsg(statusBean.getCid(), msgCode, msg, msgEn, statusBean.getMsgParam());
// } }
} catch (Exception e) { } catch (Exception e) {
log.error("客户端故障消息处理出错", e); log.error("客户端故障消息处理出错", e);
} }
......
...@@ -34,9 +34,10 @@ public class DevicesStatusUtil { ...@@ -34,9 +34,10 @@ public class DevicesStatusUtil {
*/ */
public static StatusBean getStatusBean(String cid) { public static StatusBean getStatusBean(String cid) {
StatusBean statusBean= statusMap.get(cid); StatusBean statusBean= statusMap.get(cid);
if(statusBean!=null){ if(statusBean!=null) {
StatusBean msgBean=clientMsgs.get(cid); StatusBean msgBean = clientMsgs.get(cid);
if(msgBean!=null){ //提示信息只显示2分钟
if (msgBean != null && (!msgBean.msgTimeOut())) {
statusBean.setMsg(msgBean.getMsg()); statusBean.setMsg(msgBean.getMsg());
statusBean.setMsgEn(msgBean.getMsgEn()); statusBean.setMsgEn(msgBean.getMsgEn());
statusBean.setMsgCode(msgBean.getMsgCode()); statusBean.setMsgCode(msgBean.getMsgCode());
...@@ -77,6 +78,7 @@ public class DevicesStatusUtil { ...@@ -77,6 +78,7 @@ public class DevicesStatusUtil {
} }
StatusBean statusBean = new StatusBean(); StatusBean statusBean = new StatusBean();
statusBean.setLastSaveTime(System.currentTimeMillis());
statusBean.setMsg(clientMsg); statusBean.setMsg(clientMsg);
statusBean.setMsgEn(clientMsgEn); statusBean.setMsgEn(clientMsgEn);
statusBean.setMsgCode(msgCode); statusBean.setMsgCode(msgCode);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!