Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/equipment/src/main/java/com/hnac/hzims/monitor/server/impl/RealTimeDataServerImpl.java

@@ -37,17 +37,20 @@ public class RealTimeDataServerImpl implements RealTimeDataServer {
 
 	@Override
 	public R<List<FieldsData>> getData(RealDataSearchPO po) {
-
+		R<List<FieldsData>> res = analyseDataSearchClient.getRealDataByAnalyzeCode(po);
-		List<FieldsData> data = null;
+		String msg = res.getMsg();
-		try {
+		if ("操作成功".equals(msg)) {
-			data = analyseDataSearchClient.getRealDataByAnalyzeCode(po).getData();
+			List<FieldsData> data;
-		} catch (Exception e) {
+			try {
-			throw new RuntimeException(e.getMessage());
+				data = analyseDataSearchClient.getRealDataByAnalyzeCode(po).getData();
-		}
+			} catch (Exception e) {
-		if(CollectionUtil.isNotEmpty(data)){
+				throw new RuntimeException(e.getMessage());
-			return R.data(data);
+			}
+			if (CollectionUtil.isNotEmpty(data)) {
+				return R.data(data);
+			}
 		}
-		return R.data(null);
+		return R.fail(msg);
 	}
 
 	@Override