增加 省市区 查询条件

xufenglei

2018-03-30 9b33e93fccddea356c3d686684fc58ceb176ff39

 src/main/java/com/moral/controller/ScreenController.java

@@ -7,6 +7,7 @@
import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.io.InputStreamReader;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

@@ -429,11 +430,13 @@
   public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = getParametersStartingWith(request, null);

      parameters.put("type", "month");

      parameters.put("format", "yyyy-MM");

      parameters.put("typeFormat", "%Y-%m-%d");

      parameters.put("monitorPointId", parameters.remove("monitorPoint"));

      String sensorKey = parameters.remove("sensorKey").toString();

      List<String> sensorKeys = new ArrayList<String>();

      sensorKeys.add(sensorKey);

      parameters.put("sensorKeys", sensorKeys);

      List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

      String sensorKey = parameters.get("sensorKey").toString();

		
      for (Map<String, Object> map : list) {

         String time = map.get("time").toString();

         time = time.substring(time.length() - 2);