Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

Merge remote-tracking branch 'origin/master'

 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java

@@ -144,9 +144,11 @@
        Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();

        List<Map<String, Object>> list = JSON.parseObject((String)parameters.get("items"), new TypeReference<List<Map<String, Object>>>() {});

        parameters.remove("items");

        Map<String, Object> timeType = JSON.parseObject((String)parameters.get("timeType"), new TypeReference<Map<String, Object>>() {});

        parameters.remove("timeType");

        Map<String, Object> timeType = JSON.parseObject((String)parameters.get("timeTypes"), new TypeReference<Map<String, Object>>() {});

        parameters.remove("timeTypes");

        parameters.putAll(timeType);

        parameters.put("type", parameters.get("value"));

        parameters.remove("value");

        

        ExecutorService threadPool = Executors.newCachedThreadPool();

        CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);