From 5b38785b33b06d877101ef639ca5d5e675c85b4d Mon Sep 17 00:00:00 2001
From: looper3339 <736321739@qq.com>
Date: 星期六, 25 五月 2019 17:11:55 +0800
Subject: [PATCH] change float to flex layout
---
src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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 7bbcf97..9369d93 100644
--- a/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java
+++ b/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java
@@ -4,6 +4,7 @@
import com.cloud.count.model.Config;
import com.cloud.count.model.People;
import com.cloud.count.service.CountService;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.ParseException;
@@ -51,6 +52,10 @@
private static String[] time2={"00","05","10","15","20","25",
"30","35","40","45","50","55"};
public static volatile int countType = 0;
+
+ private static Map<Integer,Integer> dayAllMap = new HashMap<>();
+ private static Map<Integer,Integer> dayOutMap = new HashMap<>();
+ private static Map<Integer,Integer> dayInMap = new HashMap<>();
/**
* 缁熻鍙傛暟鍒濆鍖栵紝鐢ㄤ簬缁熻璁惧閲嶅惎鎯呭喌(鍙戦�佺殑绗竴鏉℃姤鏂�)
@@ -100,6 +105,10 @@
if (now>start-1 && now<start+11){//琛ㄧず浠庤缃殑鍒濆鍖栨椂闂村紑濮嬮噸鏂拌鏁�
baseEnters = totalEnters;
baseExits = totalExits;
+
+ dayAllMap = new HashMap<>();
+ dayInMap = new HashMap<>();
+ dayOutMap = new HashMap<>();
}
// 浠庡紑濮嬭绠楁椂闂村埌鐜板湪鐨勮繘鏍℃暟
@@ -119,10 +128,10 @@
// 寮�濮嬬粺璁℃椂闂� 鍒嗗紑 濡�06:40
String[] times = config.getCountStartTime().split(":");
// 鍒濆璁剧疆鏃堕棿鍒嗗紑
- String[] times2 = initialTime.split(":");
+ String[] times2 = initialTime.split(":");//鍒濆鍖栨椂闂�06:00
// 璁剧疆鏃堕棿鍥捐〃鐨勯」
- int charat = Integer.parseInt(times[0]);
- int mm =Integer.parseInt(times2[0])-charat;
+ int charat = Integer.parseInt(times[0]);//缁熻寮�濮嬫椂闂�06:00
+ int mm =Integer.parseInt(times2[0])-charat;//鍒嗛挓鏄�00
// 璁剧疆鏃堕棿鍥捐〃鐨勯」锛屾瘮濡傚浘琛ㄧ殑寮�濮嬬粺璁℃椂闂翠负06:40锛屽垯time_set灏辨槸[06:40,07:40,08:40,09:40,10:40,11:40,12:40,]
for(int i=0;i<minute;i++){
//time_set[i]=time[charat]+":"+times[1];
@@ -139,9 +148,34 @@
people[i]=initialPeople;
set = hourset; //杩欒浠ｇ爜寰堥噸瑕侊紝琛ㄧず閲嶆柊缁熻
}else {
- //System.out.println("绗�"+i+"涓皬鏃剁殑鏁版嵁:");
+// System.out.println("绗�"+i+"涓皬鏃剁殑鏁版嵁:");
// people[i] = dao.countInPeople(set-60,hourset+3599)- dao.countOutPeople(set-60,hourset+3599)+initialPeople+correctionPeople;
+ //浣跨敤缂撳瓨dayAllMap
people[i] = getDataValue(map,countType,set-60,hourset+1799,initialPeople,correctionPeople);
+// if(countType == 1){
+// if(dayInMap.containsKey(i) && minute >1 && (i != minute-1)){
+// people[i] = dayInMap.get(i);
+// }else{
+// people[i] = getDataValue(map,countType,set-60,hourset+1799,initialPeople,correctionPeople);
+// dayInMap.put(i, people[i]);
+// }
+// } else if(countType == 0) {
+// if(dayAllMap.containsKey(i) && minute >1 && (i != minute-1)){
+// people[i] = dayAllMap.get(i);
+// }else{
+// people[i] = getDataValue(map,countType,set-60,hourset+1799,initialPeople,correctionPeople);
+// dayAllMap.put(i, people[i]);
+// }
+// } else {
+// if(dayOutMap.containsKey(i) && minute >1 && (i != minute-1)){
+// people[i] = dayOutMap.get(i);
+// }else{
+// people[i] = getDataValue(map,countType,set-60,hourset+1799,initialPeople,correctionPeople);
+// dayOutMap.put(i, people[i]);
+// }
+// }
+
+
}
hourset +=1800;
}
--
Gitblit v1.8.0