Commit bd37eb1a authored by 张森's avatar 张森

1、物联遥测类预警内容中缺少具体遥测数据,比如现在描述是当前液位高于阈值,当前数值到底是多少

2、区分高于阈值和低于阈值
parent d1151752
...@@ -1463,7 +1463,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1463,7 +1463,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
detailsVos.add(dynamicDetailsVo); detailsVos.add(dynamicDetailsVo);
riskBizInfoVo.setDynamicDetails(detailsVos); riskBizInfoVo.setDynamicDetails(detailsVos);
CustomizeItems customizeItems = new CustomizeItems(); CustomizeItems customizeItems = new CustomizeItems();
customizeItems.setWarningContent("消防水池+工业水池储水量<4000m³"); customizeItems.setWarningContent("当前值为" + indexValue + "m³,消防水池+工业水池储水量<4000m³");
riskBizInfoVo.setCustomizeItems(customizeItems); riskBizInfoVo.setCustomizeItems(customizeItems);
riskBizInfoVo.setExtra(extra); riskBizInfoVo.setExtra(extra);
riskBizInfoVo.setType("waterCapacity"); riskBizInfoVo.setType("waterCapacity");
...@@ -1615,18 +1615,21 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1615,18 +1615,21 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
if (minValue.compareTo(new BigDecimal(0)) > 0 if (minValue.compareTo(new BigDecimal(0)) > 0
&& maxValue.compareTo(new BigDecimal(0)) > 0) { && maxValue.compareTo(new BigDecimal(0)) > 0) {
BigDecimal divide = new BigDecimal(0); BigDecimal divide = new BigDecimal(0);
String messageLevel = "低于";
if (minValue.compareTo(nowValue) > 0) { if (minValue.compareTo(nowValue) > 0) {
divide = minValue!=null?minValue.subtract(nowValue).divide(minValue, 4, BigDecimal.ROUND_HALF_UP):null; divide = minValue!=null?nowValue.subtract(minValue).divide(minValue, 4, BigDecimal.ROUND_HALF_UP):null;
messageLevel = "低于";
} else if (nowValue.compareTo(maxValue) > 0) { } else if (nowValue.compareTo(maxValue) > 0) {
divide = minValue!=null?nowValue.subtract(maxValue).divide(maxValue, 4, BigDecimal.ROUND_HALF_UP):null; divide = minValue!=null?nowValue.subtract(maxValue).divide(maxValue, 4, BigDecimal.ROUND_HALF_UP):null;
messageLevel = "高于";
} }
// 触发预警业务 // 触发预警业务
BizMessage bizMessage = new BizMessage(); BizMessage bizMessage = new BizMessage();
bizMessage.setIndexKey(indexKey); bizMessage.setIndexKey(indexKey);
bizMessage.setIndexValue(String.valueOf(divide)); bizMessage.setIndexValue(String.valueOf(divide));
String message = "当前值为%s,%s报警阈值≥10%"; String message = "当前值为%s米,%s报警阈值%s";
// String.format(message, nowValue, ); String format = String.format(message, nowValue, messageLevel, "≥10%");
RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source, "当前值低于或高于报警阈值≥10%"); RiskBizInfoVo riskBizInfoVo = fetchData(equipmentSpecificIndex, extra, source, format);
riskBizInfoVo.setWarningObjectCode(businessId); riskBizInfoVo.setWarningObjectCode(businessId);
riskBizInfoVo.getDynamicDetails().get(0).setTabContent(tableContentVos); riskBizInfoVo.getDynamicDetails().get(0).setTabContent(tableContentVos);
bizMessage.setBizInfo(riskBizInfoVo); bizMessage.setBizInfo(riskBizInfoVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment