From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Wed, 28 Feb 2018 10:55:55 +0800 Subject: [PATCH] 设备和监控点 两模块修改,同步reids里的信息。数据字典功能添加 --- src/main/java/com/moral/controller/ScreenController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index e8bd1c8..eeac838 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -136,9 +136,8 @@ @GetMapping("alarm-levels") public Object getAlarmLevels(HttpServletRequest request, Integer orgId) { List<Map<String,Object>> sensorAlarmList = null; - AlarmConfigValue alarmConfigValue = null; try { - alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get(); + AlarmConfigValue alarmConfigValue = alarmConfigService.queryValueByOrganizationId(orgId).get(); Map<String,AlarmSensorLevel> alarmLevelMap = alarmConfigValue.getAlarmLevels(); sensorAlarmList = alarmLevelMap.keySet().stream().map(key -> { AlarmSensorLevel alarmSensorLevel = alarmLevelMap.get(key); @@ -189,9 +188,10 @@ * @param request * the request * @return the average by all + * @throws Exception */ @GetMapping("all-average") - public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) { + public Map<String, Object> getAllSensorAverageByDevice(HttpServletRequest request) throws Exception { Map<String, Object> parameters = getParametersStartingWith(request, null); return historyService.getAllSensorAverageByDevice(parameters); } @@ -299,6 +299,8 @@ Account account = accountService.getAccountById(accountId); String regionName = areaService.selectFullNameByCode(code); if(account!=null&®ionName!=null){ + //������������ + regionName = regionName.replace(" ",""); Object sensors = sensorService.queryAll(); JSONObject params = new JSONObject(); params.put("regionCode",code); -- Gitblit v1.8.0