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,8 +37,10 @@ public class RealTimeDataServerImpl implements RealTimeDataServer {
 
 	@Override
 	public R<List<FieldsData>> getData(RealDataSearchPO po) {
-
-		List<FieldsData> data = null;
+		R<List<FieldsData>> res = analyseDataSearchClient.getRealDataByAnalyzeCode(po);
+		String msg = res.getMsg();
+		if ("操作成功".equals(msg)) {
+			List<FieldsData> data;
 			try {
 				data = analyseDataSearchClient.getRealDataByAnalyzeCode(po).getData();
 			} catch (Exception e) {
@@ -47,7 +49,8 @@ public class RealTimeDataServerImpl implements RealTimeDataServer {
 			if (CollectionUtil.isNotEmpty(data)) {
 				return R.data(data);
 			}
-		return R.data(null);
+		}
+		return R.fail(msg);
 	}
 
 	@Override