Commit fa8c6bdd authored by 张森's avatar 张森

预警阈值相关 区分高于和低于,处理赋码记录未生成第二条记录问题

parent 79eaa2d9
...@@ -1516,7 +1516,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1516,7 +1516,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
String businessId, String businessId,
String topic, String topic,
String indexKey, String indexKey,
Object extra, HashMap<String, String> extra,
String source, String source,
List<TableContentVo> tableContentVos) { List<TableContentVo> tableContentVos) {
// 触发预警业务 // 触发预警业务
...@@ -1609,20 +1609,24 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1609,20 +1609,24 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
String businessId, String businessId,
String topic, String topic,
String indexKey, String indexKey,
Object extra, HashMap<String, String> extra,
String source, String source,
List<TableContentVo> tableContentVos) { List<TableContentVo> tableContentVos) {
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 = "低于"; String messageLevel = "低于";
String messageLevelCode = "low";
if (minValue.compareTo(nowValue) > 0) { if (minValue.compareTo(nowValue) > 0) {
divide = minValue!=null?nowValue.subtract(minValue).divide(minValue, 4, BigDecimal.ROUND_HALF_UP):null; divide = minValue!=null?nowValue.subtract(minValue).divide(minValue, 4, BigDecimal.ROUND_HALF_UP):null;
messageLevel = "低于"; messageLevel = "低于";
messageLevelCode = "low";
} 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 = "高于"; messageLevel = "高于";
messageLevelCode = "high";
} }
extra.put("clearUniqueCode", extra.get("clearUniqueCode") + "_" + messageLevelCode);
// 触发预警业务 // 触发预警业务
BizMessage bizMessage = new BizMessage(); BizMessage bizMessage = new BizMessage();
bizMessage.setIndexKey(indexKey); bizMessage.setIndexKey(indexKey);
...@@ -1643,7 +1647,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService { ...@@ -1643,7 +1647,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
} }
} }
public RiskBizInfoVo fetchData(EquipmentSpecificIndex equipmentSpecificIndex, Object extra, String source, String warningContent) { public RiskBizInfoVo fetchData(EquipmentSpecificIndex equipmentSpecificIndex, HashMap<String, String> extra, String source, String warningContent) {
RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo(); RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
riskBizInfoVo.setWarningObjectName(equipmentSpecificIndex.getEquipmentSpecificName()); riskBizInfoVo.setWarningObjectName(equipmentSpecificIndex.getEquipmentSpecificName());
riskBizInfoVo.setWarningObjectCode(equipmentSpecificIndex.getEquipmentSpecificCode()); riskBizInfoVo.setWarningObjectCode(equipmentSpecificIndex.getEquipmentSpecificCode());
......
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