Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -56,6 +56,12 @@
        return new ResultBean<List<Sensor>>(sensors);
    }

    @GetMapping("allById")
    public ResultBean<List<Map<String, Object>>> getAllSensorsById() {
        List<Map<String, Object>> sensors = sensorService.getSensorByDId("1230");
        return new ResultBean<List<Map<String, Object>>>(sensors);
    }

    @GetMapping("getSenosrsByOrgId")
    public ResultBean<List<Sensor>> getSenosrsByOrgId(Integer organizationId, String regionCode) {
        Map<String, Object> parameters = new HashMap<>();