From bcffe049acc4d80b21d923f5c002496c280d5668 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 02 十一月 2019 16:59:57 +0800
Subject: [PATCH] fix count mechine limit 65535
---
src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 25 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 9369d93..cfb9185 100644
--- a/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java
+++ b/src/main/java/com/cloud/count/service/serviceImpl/CountServiceImpl.java
@@ -32,6 +32,19 @@
*/
public static volatile int totalExits = 0;
/**
+ * 缁熻璁惧鍙粺璁＄殑鏈�澶ф暟閲�
+ */
+ private static final int MAXCOUNT = 65535;
+ /**
+ * 缁熻璁惧鍗曡瘝鍙粺璁＄殑鏈�澶ф暟閲�
+ */
+ private static final int MAXCOUNTONCE = 100;
+ /**
+ * 璁＄畻鐨勮繘鍏ヤ腑闂村彉閲�
+ */
+ private static volatile int tmpEnter = 0;
+ private static volatile int tmpExit = 0;
+ /**
* 瀹炴椂璁＄畻鏃朵綔涓鸿绠楃殑杩涙牎浜烘暟鍩哄噯鍊�
*/
public static volatile int realtimeBaseEnters = 0;
@@ -56,6 +69,32 @@
private static Map<Integer,Integer> dayAllMap = new HashMap<>();
private static Map<Integer,Integer> dayOutMap = new HashMap<>();
private static Map<Integer,Integer> dayInMap = new HashMap<>();
+
+ public static int addEnter(int count) {
+ int inCre = 0;
+ if(tmpEnter <= count){
+ inCre = count - tmpEnter;
+ } else {
+ if(tmpEnter >= (MAXCOUNT-MAXCOUNTONCE) && count <= MAXCOUNT) {
+ inCre = count + MAXCOUNT - tmpEnter;
+ }
+ }
+ tmpEnter = count;
+ return inCre;
+ }
+
+ public static int addExit(int count) {
+ int inCre = 0;
+ if(tmpExit <= count){
+ inCre = count - tmpExit;
+ } else {
+ if(tmpExit >= (MAXCOUNT-MAXCOUNTONCE) && count <= MAXCOUNT) {
+ inCre = count + MAXCOUNT - tmpExit;
+ }
+ }
+ tmpExit = count;
+ return inCre;
+ }
/**
* 缁熻鍙傛暟鍒濆鍖栵紝鐢ㄤ簬缁熻璁惧閲嶅惎鎯呭喌(鍙戦�佺殑绗竴鏉℃姤鏂�)
@@ -87,6 +126,15 @@
Map<String,Object> map = new HashMap<>(16);
// 鑾峰彇涓�浜涘垵濮嬪��
Config config = dao.getConfig();
+ if(config==null) {
+ config = new Config();
+ config.setCor(1);
+ config.setPassword("123456");
+ config.setCountStartTime("06:00");
+ config.setInit(1);
+ config.setInitialPeople(60);
+ config.setInitialTime("00:00");
+ }
// 鍒濆浜烘暟鍊�
int initialPeople = (config.getInit()==1)?config.getInitialPeople():0;
// 鏍℃浜烘暟鍊�
@@ -148,32 +196,33 @@
people[i]=initialPeople;
set = hourset; //杩欒浠ｇ爜寰堥噸瑕侊紝琛ㄧず閲嶆柊缁熻
}else {
-// 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]);
-// }
-// }
+ //姣忔閮藉疄鏃惰绠楋紝浼氶噸澶嶈绠楀巻鍙叉暟鎹�
+// 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]);
+ }
+ }
}
--
Gitblit v1.8.0