lizijie
2019-07-25 30d1267479ad9cb076cb2692befc6fe3a53fa7d9
删选监控站点和设备的因子
6 files modified
94 ■■■■ changed files
src/main/java/com/moral/controller/ScreenController.java 44 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/mapper/SensorMapper.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/SensorService.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/SensorServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java 17 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/SensorMapper.xml 16 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/controller/ScreenController.java
@@ -973,6 +973,50 @@
        List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
        return new ResultBean<List<Map<String, Object>>>(map);
    }
    @GetMapping("getSensorByDeviceId")
    @ApiOperation(value = "通过设备获取因子", notes = "通过设备获取因子")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "设备id", required = true, paramType = "query", dataType = "String")
    })
    public ResultBean<List<Map<String, Object>>> getSensorByDeviceId(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        String id = (String) parameters.get("id");
        List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);
        Map<String,Object> map = list.get(0);
        String monitor_point_id = map.get("monitor_point_id").toString();
        List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
        System.out.println(sensorUnitList);
        for (Map<String, Object> sensorMap : list) {
            for (Map<String, Object> sensorUnitMap : sensorUnitList) {
                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
                    sensorMap.put("unit", sensorUnitMap.get("name"));
                }
            }
        }
        return new ResultBean<List<Map<String, Object>>>(list);
    }
    @GetMapping("getSensorWithUnitByMonitorPointId")
    @ApiOperation(value = "通过站点获取因子", notes = "通过站点获取因子")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "monitor_point_id", value = "站点id", required = true, paramType = "query", dataType = "String")
    })
    public ResultBean<List<Map<String, Object>>> getSensorWithUnitByMonitorPointId(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        String monitor_point_id = (String) parameters.get("monitor_point_id");
        List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
        List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
        System.out.println(sensorUnitList);
        for (Map<String, Object> sensorMap : list) {
            for (Map<String, Object> sensorUnitMap : sensorUnitList) {
                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
                    sensorMap.put("unit", sensorUnitMap.get("name"));
                }
            }
        }
        return new ResultBean<List<Map<String, Object>>>(list);
    }
    @GetMapping("AIForecast")
    @ApiOperation(value = "AI预测", notes = "AI预测")
src/main/java/com/moral/mapper/SensorMapper.java
@@ -21,5 +21,8 @@
    List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);
    
    Map<String,Object> getSensorBySensorKey(@Param("sensor_key")String sensor_key);
    List<Map<String,Object>> getSensorByDeviceId(@Param("id")String id);
    List<Map<String,Object>> getSensorByMonitorPointId(@Param("monitor_point_id")String monitor_point_id);
}
src/main/java/com/moral/service/SensorService.java
@@ -27,4 +27,8 @@
    public List<Sensor> getAllSensors();
    
    Map<String, Object> getSensorBySensorKey(String SensorKey);
    List<Map<String,Object>> getSensorByDeviceId(String id);
    List<Map<String,Object>> getSensorByMonitorPointId(String monitor_point_id);
}
src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -89,4 +89,14 @@
        Map<String, Object> map = sensorMapper.getSensorBySensorKey(sensorKey);
        return map;
    }
    @Override
    public List<Map<String, Object>> getSensorByDeviceId(String id) {
        List<Map<String,Object>> list = sensorMapper.getSensorByDeviceId(id);
        return list;
    }
    @Override
    public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) {
        List<Map<String,Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id);
        return list;
    }
}
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -132,23 +132,6 @@
    @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;
    }
}
src/main/resources/mapper/SensorMapper.xml
@@ -128,4 +128,20 @@
        FROM sensor
        WHERE sensor_key = #{sensor_key}
    </select>
    <select id="getSensorByDeviceId" resultType="java.util.Map">
        SELECT DISTINCT d.id,d.monitor_point_id,s.*
        FROM device d,device_version dv,device_version_sensor dvs,sensor s
        WHERE d.device_version_id = dvs.device_version_id
        AND dvs.sensor_id = s.id
        AND d.id = #{id}
    </select>
    <select id="getSensorByMonitorPointId" resultType="java.util.Map">
        SELECT DISTINCT s.*
        FROM device d,device_version dv,device_version_sensor dvs,sensor s
        WHERE d.device_version_id = dvs.device_version_id
        AND dvs.sensor_id = s.id
        AND d.monitor_point_id = #{monitor_point_id}
    </select>
</mapper>