数据解析 增加 数据关联查询

src/main/java/com/yihu/quota/service/cube/ElasticSearchDataProcessService.java

@@ -1,5 +1,6 @@
package com.yihu.quota.service.cube;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.yihu.ehr.elasticsearch.ElasticSearchUtil;
import com.yihu.ehr.util.datetime.DateUtil;
@@ -55,6 +56,8 @@ public class ElasticSearchDataProcessService {
    private ElasticSearchUtil elasticSearchUtil;
    @Autowired
    private CubeService cubeService;
    @Autowired
    private ObjectMapper objectMapper;
    /**
     *
@@ -62,8 +65,7 @@ public class ElasticSearchDataProcessService {
     */
    public void saveData(String data){
        try {
            Gson gson = new Gson();
            Map<String, Object> dataMap = gson.fromJson(data, Map.class);
            Map<String, Object> dataMap = objectMapper.readValue(data,Map.class);
            if(dataMap.containsKey(dataSource_k)){
                String dataSource = dataMap.get(dataSource_k).toString();
                dataMap.remove(dataSource_k);
@@ -456,11 +458,18 @@ public class ElasticSearchDataProcessService {
                    double doubleValue = Double.valueOf(keyValue);
                    value = doubleValue;
                }else if(dataType.equals("date")){
                    String dateFormat = DateUtil.DEFAULT_DATE_YMD_FORMAT;
                    Date dateValue = null;
                    if(keyValue.length() > 10){
                        dateFormat = DateUtil.DEFAULT_YMDHMSDATE_FORMAT;;
                        if(keyValue.contains("-") ){
                            dateValue = DateUtil.parseDate(keyValue, DateUtil.DEFAULT_YMDHMSDATE_FORMAT);
                        }else {
                            //时间戳 1531130451000
                            dateValue = DateUtil.toDateFromTime(keyValue);
                        }
                    }else {
                        dateValue = DateUtil.parseDate(keyValue, DateUtil.DEFAULT_DATE_YMD_FORMAT);
                    }
                    Date dateValue = DateUtil.parseDate(keyValue, dateFormat);
                    //es 保存是少8小时
                    Calendar ca = Calendar.getInstance();
                    ca.setTime(dateValue);
                    ca.add(Calendar.HOUR_OF_DAY, 8);