Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-11 39c6e9b5e6006053d42c0c8d4dc777add9257ae6

 screen-manage/src/main/java/com/moral/api/controller/SensorController.java

@@ -47,4 +47,18 @@
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
        //return null;
    }

    @RequestMapping(value = "updateSensor", method = RequestMethod.POST)
    @ResponseBody
    public ResultMessage updateSensor(@RequestBody Map<String, Object> parameters,HttpServletRequest request) {
        //Sensor sensor = JSON.parseObject(JSON.toJSONString(parameters), Sensor.class);
        Map<String,Object> resultMap = sensorService.updateSensor(parameters);
        String msg = resultMap.get("msg").toString();
        int code = Integer.parseInt(resultMap.get("code").toString());
        if (code == 0){
            return ResultMessage.ok(msg);
        }
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
        //return null;
    }
}