From d70f7cf3cf5afbfa3d9ca396068d9ff4bfe4046f Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 22 Jul 2019 15:21:06 +0800
Subject: [PATCH] app更新

---
 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