高斯同步空值判断

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/StringUtil.java

@@ -4,7 +4,7 @@ import java.math.BigDecimal;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 import com.yeejoin.equipmanage.common.vo.QRCodeRequest;
 
@@ -96,6 +96,13 @@ public class StringUtil {
 		return 0;
 	}
 	
+	public static String toNotEmptyString(String s) {
+		if (ObjectUtils.isEmpty(s)) {
+			return "";
+		}
+		return s;
+	}
+
 	/**
 	 * 截取前后都不是0的数字字符串
 	 * 

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

@@ -1241,22 +1241,22 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 	  equipmentAlarmLogs.forEach(action->{
 		  FireEquipmentFireAlarm alarm = new FireEquipmentFireAlarm();
 		  BeanUtils.copyProperties(action, alarm);
-		  alarm.setAliasname(action.getEquipmentSpecificIndexName());
-		  alarm.setEquipmentMeasurementId(action.getEquipmentIndexId().toString());
-		  alarm.setEquipmentMeasurementMRid(action.getEquipmentIndexId().toString());
-		  alarm.setFieldLabel(action.getEquipmentSpecificIndexKey());
-		  alarm.setFieldName(action.getEquipmentSpecificIndexName());
-		  alarm.setFireEquipmentId(action.getEquipmentSpecificId().toString());
-		  alarm.setFireEquipmentMRid(action.getEquipmentSpecificCode());
-		  alarm.setFireEquipmentName(action.getEquipmentSpecificName());
+		  alarm.setAliasname(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexName()));
+		  alarm.setEquipmentMeasurementId(StringUtil.toNotEmptyString(action.getEquipmentIndexId().toString()));
+		  alarm.setEquipmentMeasurementMRid(StringUtil.toNotEmptyString(action.getEquipmentIndexId().toString()));
+		  alarm.setFieldLabel(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexKey()));
+		  alarm.setFieldName(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexName()));
+		  alarm.setFireEquipmentId(StringUtil.toNotEmptyString(action.getEquipmentSpecificId().toString()));
+		  alarm.setFireEquipmentMRid(StringUtil.toNotEmptyString(action.getEquipmentSpecificCode()));
+		  alarm.setFireEquipmentName(StringUtil.toNotEmptyString(action.getEquipmentSpecificName()));
 		  alarm.setFrequency(1);
-		  alarm.setId(action.getId().toString());
+		  alarm.setId(StringUtil.toNotEmptyString(action.getId().toString()));
 		  alarm.setMrid(action.getId().toString());
 		  alarm.setName(action.getEquipmentSpecificIndexName());
 		  alarm.setRecoveryDate(action.getUpdateDate());
-		  alarm.setStationCode(ObjectUtils.isEmpty(stationInfo)?"":stationInfo.get("stationCode"));
-		  alarm.setStationName(ObjectUtils.isEmpty(stationInfo)?"":stationInfo.get("stationName"));
-		  alarm.setValue(action.getEquipmentSpecificIndexValue());
+		  alarm.setStationCode(StringUtil.toNotEmptyString(stationInfo.get("stationCode")));
+		  alarm.setStationName(StringUtil.toNotEmptyString(stationInfo.get("stationName")));
+		  alarm.setValue(StringUtil.toNotEmptyString(action.getEquipmentSpecificIndexValue()));
 		  alarmList.add(alarm);
 	  });
       return alarmList;