From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001 From: JinPengYong <812110275@qq.com> Date: Sun, 26 Apr 2020 16:18:30 +0800 Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts. --- src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java index ffd22cb..0f8c004 100644 --- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java +++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java @@ -73,10 +73,10 @@ List<Integer> orgIds = orgMapper.selectLowerOrgIds(orgId); params.put("orgIds",orgIds); monitorPointList = monitorPointMapper.selectByMap(params); - for(MonitorPoint monitorPoint:monitorPointList){ - Integer state = getStateFromRedis(monitorPoint.getId()); - monitorPoint.setState(state); - } +// for(MonitorPoint monitorPoint:monitorPointList){ +// Integer state = getStateFromRedis(monitorPoint.getId()); +// monitorPoint.setState(state); +// } } return monitorPointList == null ? new ArrayList<>() : monitorPointList; } @@ -349,4 +349,19 @@ return result.values(); } + + @Override + public void isCompensateCalculation(Map<String, Object> parameters) { + MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(parameters.get("monitorPointId").toString())); + if (Integer.valueOf(320581).equals(monitorPoint.getAreaCode())) { + parameters.put("compensate", true); + } + + } + @Override + public Map<String, Object> selectAllById(String id) { + int id2 = Integer.parseInt(id); + Map<String, Object> map = monitorPointMapper.selectAllById(id2); + return map; + } } -- Gitblit v1.8.0