|
@@ -91,23 +91,26 @@ public class TrackingServiceImpl implements TrackingService {
|
|
|
//获取索引名
|
|
|
String index = trackingBody.getAppId().split("-")[0];
|
|
|
|
|
|
- Object data = trackingBody.getRequestData().get("data");
|
|
|
- //如果是数组,需要拆解成多条数据入库
|
|
|
- if(data instanceof Iterable){
|
|
|
- List<LinkedHashMap> dataList = (List<LinkedHashMap>)data;
|
|
|
- List<JSONObject> list = dataList.stream().map(item -> {
|
|
|
- TrackingBody subBody = BeanUtil.copyProperties(trackingBody, TrackingBody.class);
|
|
|
- subBody.getRequestData().put("data", item);
|
|
|
- return JSON.parseObject(JSON.toJSONString(subBody));
|
|
|
- }).collect(Collectors.toList());
|
|
|
- if(CollUtil.isEmpty(list)){
|
|
|
- return ResultData.ok("data为空");
|
|
|
+ JSONObject requestData = trackingBody.getRequestData();
|
|
|
+
|
|
|
+ if(Objects.nonNull(requestData)){
|
|
|
+ Object data = trackingBody.getRequestData().get("data");
|
|
|
+ //如果是数组,需要拆解成多条数据入库
|
|
|
+ if(data instanceof Iterable){
|
|
|
+ List<LinkedHashMap> dataList = (List<LinkedHashMap>)data;
|
|
|
+ List<JSONObject> list = dataList.stream().map(item -> {
|
|
|
+ TrackingBody subBody = BeanUtil.copyProperties(trackingBody, TrackingBody.class);
|
|
|
+ subBody.getRequestData().put("data", item);
|
|
|
+ return JSON.parseObject(JSON.toJSONString(subBody));
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ if(CollUtil.isEmpty(list)){
|
|
|
+ return ResultData.ok("data为空");
|
|
|
+ }
|
|
|
+ RestStatus restStatus = documentService.batchImportGoodsData(list, "aaaaa");
|
|
|
+ return ResultData.ok(restStatus.getStatus());
|
|
|
}
|
|
|
- RestStatus restStatus = documentService.batchImportGoodsData(list, "aaaaa");
|
|
|
- return ResultData.ok(restStatus.getStatus());
|
|
|
}
|
|
|
|
|
|
-
|
|
|
RestStatus restStatus = documentService.addDocument("index", null, null, JSON.toJSONString(trackingBody));
|
|
|
|
|
|
return ResultData.ok(restStatus.getStatus());
|