修改冲突代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -872,10 +872,10 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 		}
 		// 报警表新增信息
 		if (ObjectUtils.isEmpty(indexAlarms) && (TrueOrFalseEnum.real.value.equals(equipmentSpcIndex.getValue()))) {
-			addEquipmentSpecificAlarm(equipmentSpecificAlarms, equipmentSpcIndex, equipmentSpecificAlarm);
+			equipmentSpecificAlarms = addEquipmentSpecificAlarm(equipmentSpecificAlarms, equipmentSpcIndex, equipmentSpecificAlarm);
 		} else {
 			// 报警表更新信息
-			indexAlarms.forEach(action -> {
+			for (EquipmentSpecificAlarm action : indexAlarms) {
 				if (TrueOrFalseEnum.real.value.equals(equipmentSpcIndex.getValue())) {
 					// 报警，修改发生频率
 					action.setFrequency((action.getFrequency() + 1));
@@ -895,7 +895,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 				action.setEquipmentSpecificCode(equipmentSpcIndex.getEquipmentSpecificCode());
 				action.setBuildId(equipmentSpcIndex.getBuildId());
 				equipmentSpecificAlarms.add(action);
-			});
+			}
 		}
 
 		return equipmentSpecificAlarms;