| | |
| | | if (!params.containsKey("datas") || StringUtils.isBlank(params.get("datas").toString())) { |
| | | return success(result); |
| | | } |
| | | log.info("datas:" + params.get("datas").toString()); |
| | | JSONArray jsonArray = JSON.parseArray(params.get("datas").toString()); |
| | | JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(params.get("datas"))); |
| | | for (Object data : jsonArray) { |
| | | Map<String, Object> param = new HashMap<>(); |
| | | JSONObject jsonObject = JSON.parseObject(data.toString()); |
| | | JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(data)); |
| | | param.put("dataType",jsonObject.get("dataType")); |
| | | param.put("dataNo",jsonObject.get("dataNo")); |
| | | param.put("startTime",params.get("startTime")); |
| | | param.put("endTime",params.get("endTime")); |
| | | List<Object[]> historyValue = dataService.getHistoryValue(params); |
| | | List<Object[]> historyValue = dataService.getHistoryValue(param); |
| | | result.put(jsonObject.get("dataNo").toString(),historyValue); |
| | | } |
| | | return success(result); |