|
@ -2,19 +2,14 @@ package com.yihu.iot.datainput.service;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
//import com.yihu.base.hbase.HBaseHelper;
|
|
|
import com.yihu.elasticsearch.ElasticSearchHelper;
|
|
|
import com.yihu.iot.datainput.util.ConstantUtils;
|
|
|
import com.yihu.iot.datainput.util.RowKeyUtils;
|
|
|
import com.yihu.iot.service.common.ElasticSearchQueryGenerator;
|
|
|
import com.yihu.jw.restmodel.iot.datainput.DataBodySignsVO;
|
|
|
import com.yihu.jw.restmodel.iot.datainput.WeRunDataVO;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import io.searchbox.core.SearchResult;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
//import org.apache.hadoop.hbase.Cell;
|
|
|
//import org.apache.hadoop.hbase.client.Result;
|
|
|
//import org.apache.hadoop.hbase.util.Bytes;
|
|
|
import org.elasticsearch.search.builder.SearchSourceBuilder;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@ -22,7 +17,14 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.util.*;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
//import com.yihu.base.hbase.HBaseHelper;
|
|
|
//import org.apache.hadoop.hbase.Cell;
|
|
|
//import org.apache.hadoop.hbase.client.Result;
|
|
|
//import org.apache.hadoop.hbase.util.Bytes;
|
|
|
|
|
|
@Component
|
|
|
public class DataSearchService {
|
|
@ -104,7 +106,7 @@ public class DataSearchService {
|
|
|
//inner,nested object在es中修改只支持替换整个的object
|
|
|
resultObject = (JSONObject) JSONObject.parse(String.valueOf(resultSource));
|
|
|
//文档里的data数组对象数据
|
|
|
datas = (JSONArray) resultObject.get("data");
|
|
|
datas = (JSONArray) resultObject.get("measure_data");
|
|
|
for (Object data : datas) {
|
|
|
JSONObject dataJson = (JSONObject) data;
|
|
|
if (StringUtils.equalsIgnoreCase(rid, dataJson.getString("rid"))) {
|
|
@ -119,7 +121,7 @@ public class DataSearchService {
|
|
|
}
|
|
|
|
|
|
JSONObject updateObj = new JSONObject();
|
|
|
updateObj.put("data",datas);
|
|
|
updateObj.put("measure_data",datas);
|
|
|
// boolean bool = elastricSearchHelper.update(ConstantUtils.esIndex, ConstantUtils.esType, _id, updateObj.toJSONString());
|
|
|
// Update update = new Update();
|
|
|
// update.
|