修改单位返回格式

lizijie

2019-06-14 9ea24035a5a3c8c5a99551a075d47aa26eadbcaf

修改单位返回格式

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

@@ -951,13 +951,13 @@
    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "monitor_point_id", value = "监测站点id", required = true, paramType = "query", dataType = "String")

    })

    public ResultBean<Map<String, Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {

    public ResultBean<List<Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {

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

        String monitor_point_id = (String) parameters.get("monitor_point_id");

        System.out.println("ScreenController-----getSensorByMonitorPointId-----monitor_point_id:"+monitor_point_id);

        Map<String, Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);

        List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);

        System.out.println("ScreenController-----getSensorByMonitorPointId-----map:"+map);

        return new ResultBean<Map<String, Map<String, Object>>>(map);

        return new ResultBean<List<Map<String, Object>>>(map);

    }

    

    @GetMapping("AIForecast")


 src/main/java/com/moral/service/SensorUnitService.java

@@ -22,4 +22,6 @@
    
    Map<String, Map<String, Object>> getSensorsByMonitPointId(String id);
    
    List<Map<String, Object>> getSensorsByMonitPointId2(String id);
    
}

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

@@ -91,16 +91,12 @@

    @Override
    public Map<String, Object> getSensorByMac(String mac) {
        System.out.println("SensorUnitServiceImpl-----getSensorByMac-----mac:"+mac);
        List<Map<String, Object>> list = sensorUnitMapper.getSensorsByDeviceMac(mac);
        System.out.println("SensorUnitServiceImpl----getSensorByMac----list:"+list);
        if (list!=null && !list.isEmpty()) {
            Map<String, Object> sensorUnitMap = new HashMap<>();
            for(Map<String, Object> sensorMap : list) {
                String sensor_key = (String) sensorMap.get("sensor_key");
                System.out.println("SensorUnitServiceImpl----getSensorByMac----sensor_key:"+sensor_key);
                String name = (String) sensorMap.get("name");
                System.out.println("SensorUnitServiceImpl----getSensorByMac----name:"+name);
                sensorUnitMap.put(sensor_key, name);
            }
            System.out.println(sensorUnitMap);
@@ -111,33 +107,9 @@
        }
    }
    
    /*@Override
    public Map<String, Object> getSensorsByMonitPointId(String id) {
        System.out.println("SensorUnitServiceImpl-----getSensorsByMonitPointId-----id:"+id);
        List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
        System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----list:"+list);
        if (list!=null && !list.isEmpty()) {
            Map<String, Object> sensorUnitMap = new HashMap<>();
            for(Map<String, Object> sensorMap : list) {
                String sensor_key = (String) sensorMap.get("sensor_key");
                System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----sensor_key:"+sensor_key);
                String name = (String) sensorMap.get("name");
                System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----name:"+name);
                sensorUnitMap.put(sensor_key, name);
            }
            System.out.println(sensorUnitMap);
            return sensorUnitMap;
        } else {
            Map<String, Object> sensorUnitMap =  null;
            return sensorUnitMap;
        }
    }*/
	
    @Override
    public Map<String, Map<String, Object>> getSensorsByMonitPointId(String id) {
        System.out.println("SensorUnitServiceImpl-----getSensorsByMonitPointId-----id:"+id);
        List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
        System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----list:"+list);
        if (list!=null && !list.isEmpty()) {
            Map<String, Object> innerMap = new HashMap<>();
            Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>();
@@ -146,9 +118,7 @@
                innerMap.put("name", sensorMap.get("name"));
                innerMap.put("rules", sensorMap.get("rules"));
                String sensor_key = (String) sensorMap.get("sensor_key");
                System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----sensor_key:"+sensor_key);
                String name = (String) sensorMap.get("name");
                System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----name:"+name);
                sensorUnitMap.put(sensor_key, innerMap);
            }
            System.out.println(sensorUnitMap);
@@ -158,4 +128,27 @@
            return sensorUnitMap;
        }
    }

    @Override
    public List<Map<String, Object>> getSensorsByMonitPointId2(String id) {
        List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
        /*if (list!=null && !list.isEmpty()) {
            Map<String, Object> innerMap = new HashMap<>();
            Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>();
            for(Map<String, Object> sensorMap : list) {
                innerMap.put("unit", sensorMap.get("unit"));
                innerMap.put("name", sensorMap.get("name"));
                innerMap.put("rules", sensorMap.get("rules"));
                String sensor_key = (String) sensorMap.get("sensor_key");
                String name = (String) sensorMap.get("name");
                sensorUnitMap.put(sensor_key, innerMap);
            }
            System.out.println(sensorUnitMap);
            return sensorUnitMap;
        } else {
            Map<String, Map<String, Object>> sensorUnitMap =  null;
            return sensorUnitMap;
        }*/
        return list;
    }
}