From 86b189ee9072db4bf2648c16307eff1da077e8e4 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 23 五月 2019 14:39:10 +0800
Subject: [PATCH] fix in num,add sql index,change every 1s to every 10s
---
src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java b/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java
index 0280098..7bbcf97 100644
--- a/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java
+++ b/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java
@@ -104,12 +104,12 @@
// 浠庡紑濮嬭绠楁椂闂村埌鐜板湪鐨勮繘鏍℃暟
//杩涙牎浜烘暟 = 褰撳墠鎶ユ枃totalEnters - 鍩哄噯杩涙牎浜烘暟 + 鏍℃鍊�
- int inPeople = totalEnters - baseEnters + correctionPeople;
+ int inPeople = totalEnters - baseEnters + correctionPeople + initialPeople;
int outPeople = totalExits - baseExits;
// 鏍″唴鎬讳汉鏁� = 杩涙牎浜烘暟 - 鍑烘牎浜烘暟 + 鏍″唴鍒濆鍖栦汉鏁� + 璇樊鏁伴噺
- int allPeople = inPeople - outPeople + initialPeople;
+ int allPeople = inPeople - outPeople;
// 鐜板湪绂诲紑濮嬬粺璁＄殑鏃堕棿鐨勫皬鏃舵暟 7涓灏忔椂 鎸�7涓皬鏃剁畻
//int hour = (int)(Math.abs(now-set)+3599)/3600;
@@ -135,7 +135,7 @@
// 浣嗘槸鍙細缁熻7锛�30锛屽垯7锛�30缁熻鐨勬暟鎹粯璁や负鍒濆浜烘暟锛屽苟涓斾互鍚庣殑浠�7锛�30寮�濮嬬粺璁�
long hourset = set;
for(int i=0;i<minute;i++){
- if( (mm==i) && (countType==0) ){
+ if( (mm == i) && (countType==0) ){
people[i]=initialPeople;
set = hourset; //杩欒浠ｇ爜寰堥噸瑕侊紝琛ㄧず閲嶆柊缁熻
}else {
@@ -160,20 +160,21 @@
* @return
*/
private int getDataValue( Map<String, Object> map,int i,long start,long end,int initialPeople,int correctionPeople){
+ String todayStr = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
switch (i){
case 1:
map.put("countType","杩涙牎浜烘暟");
- Integer countInPeople = dao.countInPeople(start,end);
- countInPeople=countInPeople==null||countInPeople<0?0:countInPeople;
+ Integer countInPeople = dao.countInPeople(start, end, todayStr);
+ countInPeople=countInPeople==null||countInPeople < 0? 0 : countInPeople;
return countInPeople+correctionPeople;
case -1:
map.put("countType","鍑烘牎浜烘暟");
- Integer countOutPeople = dao.countOutPeople(start,end);
- return countOutPeople==null||countOutPeople<0?0:countOutPeople;
+ Integer countOutPeople = dao.countOutPeople(start, end, todayStr);
+ return countOutPeople==null||countOutPeople < 0? 0 : countOutPeople;
case 0:
map.put("countType","鏍″唴浜烘暟");
- Integer in = dao.countInPeople(start,end);
- Integer out = dao.countOutPeople(start,end);
+ Integer in = dao.countInPeople(start, end, todayStr);
+ Integer out = dao.countOutPeople(start, end, todayStr);
in = in==null||in<0?0:in;
out = out==null||out<0?0:out;
return in-out+initialPeople+correctionPeople;
--
Gitblit v1.8.0