Merge branch 'dev' of shikejing/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -1047,4 +1047,17 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
        }
    }
    @ApiOperation("获取华米手环查询指标")
    @RequestMapping(value = "getHuaMiParameters",method = {RequestMethod.POST,RequestMethod.GET})
    public ObjEnvelop getHuaMiParameters(){
        try {
            String sql = "select value as code,name from xmiot.wlyy_iot_tz_dict where code='HuaMiIot' and del=1";
            List<Map<String,Object>> result = jdbcTemplate.queryForList(sql);
            return  ObjEnvelop.getSuccess("查询成功",result);
        }catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败"+e.getMessage());
        }
    }
}