潘钊 / bsth_control · Commits

Commit efefc0495679e76b41d9272b45ab280e8bb2e9f0

Authored by 王通
1 parent 100ef353
build: skipped

1.rfid日志信息

Inline Side-by-side
Showing 4 changed files with 19 additions and 3 deletions
src/main/java/com/bsth/data/gpsdata_v2/rfid/RfidHttpLoader.java
  View file @efefc04
@@ -3,7 +3,7 @@ package com.bsth.data.gpsdata_v2.rfid; @@ -3,7 +3,7 @@ package com.bsth.data.gpsdata_v2.rfid;
3 import com.bsth.data.gpsdata_v2.rfid.entity.RfidInfo; 3 import com.bsth.data.gpsdata_v2.rfid.entity.RfidInfo;
4 import com.bsth.util.ConfigUtil; 4 import com.bsth.util.ConfigUtil;
5 import com.fasterxml.jackson.databind.ObjectMapper; 5 import com.fasterxml.jackson.databind.ObjectMapper;
6 -import org.apache.tomcat.util.http.fileupload.IOUtils; 6 +import org.apache.commons.io.IOUtils;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 8 import org.slf4j.LoggerFactory;
9 9
src/main/java/com/bsth/data/gpsdata_v2/rfid/handle/RfidDataHandler.java
  View file @efefc04
@@ -40,11 +40,13 @@ public class RfidDataHandler { @@ -40,11 +40,13 @@ public class RfidDataHandler {
40 * @param list 40 * @param list
41 */ 41 */
42 public void handle(List<RfidInfo> list){ 42 public void handle(List<RfidInfo> list){
  43 + int count = 0;
43 for (RfidInfo ri : list) { 44 for (RfidInfo ri : list) {
44 RfidInfo rfidInfo = nbbm2rfid.get(ri.getNbbm()); 45 RfidInfo rfidInfo = nbbm2rfid.get(ri.getNbbm());
45 // 接口获取的RFID和本地缓存识别时间不同并且识别时间在5分钟内 46 // 接口获取的RFID和本地缓存识别时间不同并且识别时间在5分钟内
46 - boolean isValid = rfidInfo == null || ri.getRecogTime() != null && rfidInfo.getRecogTime().getTime() != ri.getRecogTime().getTime() && ri.getRecogTime().getTime() > System.currentTimeMillis() - 300000; 47 + boolean isValid = ri.getRecogTime() != null && (rfidInfo == null || rfidInfo.getRecogTime().getTime() != ri.getRecogTime().getTime() && ri.getRecogTime().getTime() > System.currentTimeMillis() - 300000);
47 if (isValid) { 48 if (isValid) {
  49 + count++;
48 nbbm2rfid.put(ri.getNbbm(), ri); 50 nbbm2rfid.put(ri.getNbbm(), ri);
49 ScheduleRealInfo scheduleRealInfo = dayOfSchedule.executeCurr(ri.getNbbm()); 51 ScheduleRealInfo scheduleRealInfo = dayOfSchedule.executeCurr(ri.getNbbm());
50 if (scheduleRealInfo == null) { 52 if (scheduleRealInfo == null) {
@@ -77,6 +79,7 @@ public class RfidDataHandler { @@ -77,6 +79,7 @@ public class RfidDataHandler {
77 } 79 }
78 } 80 }
79 81
  82 + logger.info("rfid有效数:" + count);
80 //checkValid(); 83 //checkValid();
81 } 84 }
82 85
src/main/java/com/bsth/data/gpsdata_v2/thread/RfidDataLoaderThread.java
  View file @efefc04
@@ -31,4 +31,18 @@ public class RfidDataLoaderThread extends Thread { @@ -31,4 +31,18 @@ public class RfidDataLoaderThread extends Thread {
31 logger.error("", e); 31 logger.error("", e);
32 } 32 }
33 } 33 }
  34 +
  35 + public static void main(String[] args) {
  36 + List<RfidInfo> list = RfidHttpLoader.load();
  37 + if (null != list && list.size() > 0) {
  38 + int count = 0;
  39 + long now = System.currentTimeMillis();
  40 + for (RfidInfo ri : list) {
  41 + if (ri.getRecogTime() != null && ri.getRecogTime().getTime() > System.currentTimeMillis() - 300000) {
  42 + count++;
  43 + }
  44 + }
  45 + System.out.println("count:" + count);
  46 + }
  47 + }
34 } 48 }
35 \ No newline at end of file 49 \ No newline at end of file
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @efefc04
@@ -6,7 +6,6 @@ import com.bsth.common.Constants; @@ -6,7 +6,6 @@ import com.bsth.common.Constants;
6 import com.bsth.common.ResponseCode; 6 import com.bsth.common.ResponseCode;
7 import com.bsth.data.LineConfigData; 7 import com.bsth.data.LineConfigData;
8 import com.bsth.data.gpsdata_v2.GpsRealData; 8 import com.bsth.data.gpsdata_v2.GpsRealData;
9 -import com.bsth.data.gpsdata_v2.rfid.handle.RfidDataHandler;  
10 import com.bsth.data.gpsdata_v2.utils.GpsDataRecovery; 9 import com.bsth.data.gpsdata_v2.utils.GpsDataRecovery;
11 import com.bsth.data.schedule.f_a_l.FirstAndLastHandler; 10 import com.bsth.data.schedule.f_a_l.FirstAndLastHandler;
12 import com.bsth.entity.realcontrol.LineConfig; 11 import com.bsth.entity.realcontrol.LineConfig;