|
|
@ -1,6 +1,7 @@ |
|
|
|
package com.hnac.hzims.monitor.server.impl; |
|
|
|
package com.hnac.hzims.monitor.server.impl; |
|
|
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
|
|
|
import com.google.common.collect.Lists; |
|
|
|
import com.hnac.hzims.equipment.entity.EmInfoEntity; |
|
|
|
import com.hnac.hzims.equipment.entity.EmInfoEntity; |
|
|
|
import com.hnac.hzims.equipment.mapper.EmInfoMapper; |
|
|
|
import com.hnac.hzims.equipment.mapper.EmInfoMapper; |
|
|
|
import com.hnac.hzims.monitor.server.RealTimeDataServer; |
|
|
|
import com.hnac.hzims.monitor.server.RealTimeDataServer; |
|
|
@ -40,11 +41,10 @@ public class RealTimeDataServerImpl implements RealTimeDataServer { |
|
|
|
R<List<FieldsData>> res = analyseDataSearchClient.getRealDataByAnalyzeCode(po); |
|
|
|
R<List<FieldsData>> res = analyseDataSearchClient.getRealDataByAnalyzeCode(po); |
|
|
|
String msg = res.getMsg(); |
|
|
|
String msg = res.getMsg(); |
|
|
|
if ("操作成功".equals(msg)) { |
|
|
|
if ("操作成功".equals(msg)) { |
|
|
|
List<FieldsData> data; |
|
|
|
R<List<FieldsData>> realDataResult = analyseDataSearchClient.getRealDataByAnalyzeCode(po); |
|
|
|
try { |
|
|
|
List<FieldsData> data = Lists.newArrayList(); |
|
|
|
data = analyseDataSearchClient.getRealDataByAnalyzeCode(po).getData(); |
|
|
|
if(realDataResult.isSuccess()) { |
|
|
|
} catch (Exception e) { |
|
|
|
data.addAll(realDataResult.getData()); |
|
|
|
throw new RuntimeException(e.getMessage()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
if (CollectionUtil.isNotEmpty(data)) { |
|
|
|
if (CollectionUtil.isNotEmpty(data)) { |
|
|
|
return R.data(data); |
|
|
|
return R.data(data); |
|
|
|