bug提交

patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/config/MVCConfig.java

@@ -0,0 +1,30 @@
package com.yihu.wlyy.statistics.config;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import java.util.List;
/**
 * Created by chenweida on 2017/7/17.
 */
@Configuration
public class MVCConfig extends WebMvcConfigurerAdapter {
    /**
     * 为null的数据不返回
     * @param converters
     */
    @Override
    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
        MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
        ObjectMapper objectMapper=new ObjectMapper();
        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
        mappingJackson2HttpMessageConverter.setObjectMapper(objectMapper);
        converters.add(mappingJackson2HttpMessageConverter);
    }
}

patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/controller/QueryController.java

@@ -89,7 +89,7 @@ public class QueryController {
    @RequestMapping(value = "/test", method = RequestMethod.GET)
    public List<SaveModel> getQuotas()throws Exception {
        String sql="SELECT city,cityName,sum(result1) result1 FROM wlyy_quota_test group by town,townName";
        String sql="SELECT town,townName,sum(result1) result1 FROM wlyy_quota_test group by town,townName";
        return elasticsearchService.excute(sql);
    }

patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/model/job/ElasticsearchService.java

@@ -9,6 +9,7 @@ import com.yihu.wlyy.statistics.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.Search;
import io.searchbox.core.SearchResult;
import org.elasticsearch.action.fieldstats.FieldStats;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
@@ -122,7 +123,9 @@ public class ElasticsearchService {
                        if (value instanceof String) {
                            SaveModel.class.getMethod(key, String.class).invoke(saveModel,value);
                        }else if (value instanceof Integer) {
                            SaveModel.class.getMethod(key, String.class).invoke(saveModel,value);
                            SaveModel.class.getMethod(key, Integer.class).invoke(saveModel, value);
                        }else if (value instanceof Double) {
                            SaveModel.class.getMethod(key, Integer.class).invoke(saveModel,  ((Double)value).intValue());
                        }
                    }
                    saveModels.add(saveModel);
@@ -137,6 +140,6 @@ public class ElasticsearchService {
    }
    public String UpFirstStr(String str) {
        return str.toLowerCase().replaceFirst(str.substring(0, 1), str.substring(0, 1).toUpperCase());
        return str.replaceFirst(str.substring(0, 1), str.substring(0, 1).toUpperCase());
    }
}

patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/vo/SaveModel.java

@@ -6,6 +6,8 @@ import org.elasticsearch.index.analysis.AnalysisSettingsRequired;
import org.springframework.data.annotation.CreatedDate;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
/**
 * Created by chenweida on 2017/6/1.
@@ -20,6 +22,8 @@ public class SaveModel {
    private final static String OrgLevel = "4";
    private final static String townLevel = "3";
    private final static String cityLevel = "2";
    private static final Map<String, String> fieldsSithch = new HashMap<>();
    @JestId
    private String id;
@@ -301,4 +305,5 @@ public class SaveModel {
            }
        }
    }
}