Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

@@ -86,4 +86,15 @@
        }
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }

    @RequestMapping(value = "getSensorByFuzzy", method = RequestMethod.GET)
    @ResponseBody
    public ResultMessage getSensorByFuzzy(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        Map<String,Object> resultMap = sensorService.getSensorByFuzzy(parameters);
        if (!resultMap.containsKey("code")){
            return ResultMessage.ok(resultMap);
        }
        return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
    }
}