Compare commits
No commits in common. "main" and "detached" have entirely different histories.
|
|
@ -1,20 +0,0 @@
|
|||
package com.ruoyi.web.core.config;
|
||||
|
||||
import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.scheduling.annotation.Schedules;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
@Component
|
||||
@EnableScheduling
|
||||
public class MyScheduledTask {
|
||||
|
||||
@Scheduled(cron = "0/10 * * * * ?")
|
||||
public void runTask() {
|
||||
// Your task logic here
|
||||
// System.out.println("我被执行了！！！！！" + new Date().toString());
|
||||
}
|
||||
}
|
||||
|
|
@ -102,12 +102,9 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
}
|
||||
|
||||
private void task(SysRadar radar, Socket socket, Map<String, SysIdentifier> identifierHashMap) {
|
||||
long noDataStart1 = System.currentTimeMillis();
|
||||
long noDataStart2 = System.currentTimeMillis();
|
||||
int consecutiveZeros1 = 0;
|
||||
int consecutiveZeros2 = 0;
|
||||
int readCount1 = 1;
|
||||
int readCount2 = 1;
|
||||
long noDataStart = System.currentTimeMillis();
|
||||
int consecutiveZeros = 0;
|
||||
int readCount = 1;
|
||||
|
||||
Map<String, List<PrimaryRadarData>> map = new HashMap<>();
|
||||
|
||||
|
|
@ -118,60 +115,36 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
|
||||
// socket连接成功返回数据
|
||||
DataResponse data = SocketUtil.getData(socket, radar.getRadarLocation(), radar.getRadarIp(), radar.getRadarId());
|
||||
|
||||
if (readCount1 == 2 && CollectionUtils.isNotEmpty(data.getData()) && data.getData().get(11) == 1) {
|
||||
timeMap.put("noDataStart1", System.currentTimeMillis());
|
||||
if (readCount == 2) {
|
||||
timeMap.put("noDataStart", System.currentTimeMillis());
|
||||
}
|
||||
if (readCount2 == 2 && CollectionUtils.isNotEmpty(data.getData()) && data.getData().get(11) == 2) {
|
||||
timeMap.put("noDataStart2", System.currentTimeMillis());
|
||||
}
|
||||
|
||||
|
||||
if (consecutiveZeros1 == 0) {
|
||||
timeMap.put("zero1", System.currentTimeMillis());
|
||||
timeMap.put("zero2", System.currentTimeMillis());
|
||||
if (consecutiveZeros == 0) {
|
||||
timeMap.put("zero", System.currentTimeMillis());
|
||||
}
|
||||
// 没数据返回data.data == null
|
||||
long current = System.currentTimeMillis();
|
||||
if (Objects.isNull(data.getData())) {
|
||||
current = System.currentTimeMillis();
|
||||
// 连续2秒没读到数据，结束
|
||||
if (current - noDataStart1 >= 2000) {
|
||||
if (current - noDataStart >= 2000) {
|
||||
// todo:存数据
|
||||
if (CollectionUtils.isNotEmpty(map.get(getMapKey(radar, 1)))) {
|
||||
if (readCount1 > 1) {
|
||||
saveData(radar, map, readCount1, timeMap.get("noDataStart1"), current, 1);
|
||||
timeMap.put("noDataStart1", System.currentTimeMillis());
|
||||
readCount1 = 1;
|
||||
}
|
||||
map.remove(getMapKey(radar, 1));
|
||||
}
|
||||
noDataStart1 = current;
|
||||
}
|
||||
if (current - noDataStart2 >= 2000) {
|
||||
if (CollectionUtils.isNotEmpty(map.get(getMapKey(radar, 2)))) {
|
||||
if (readCount2 > 1) {
|
||||
saveData(radar, map, readCount2, timeMap.get("noDataStart2"), current, 2);
|
||||
timeMap.put("noDataStart2", System.currentTimeMillis());
|
||||
readCount2 = 1;
|
||||
}
|
||||
map.remove(getMapKey(radar, 2));
|
||||
}
|
||||
noDataStart2 = current;
|
||||
if (CollectionUtils.isNotEmpty(map.get(getMapKey(radar)))) {
|
||||
if (readCount > 1) {
|
||||
saveData(radar, map, readCount, timeMap.get("noDataStart"), current);
|
||||
timeMap.put("noDataStart", System.currentTimeMillis());
|
||||
readCount = 1;
|
||||
}
|
||||
}
|
||||
|
||||
ModbusResponse modbusResponse = getModbusResponse(data);
|
||||
map.remove(getMapKey(radar));
|
||||
noDataStart = current;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// SysRadar sysRadar = service.selectRadarByRadarId(radar.getRadarId(), radar.getRadarIp());
|
||||
// if (sysRadar != null) { // 雷达数据返回封装类赋值
|
||||
if (modbusResponse != null) {
|
||||
ModbusResponse modbusResponse = getModbusResponse(data);
|
||||
String tag = modbusResponse.getTagId();
|
||||
if (readCount1 == 2) {
|
||||
timeMap.put("start1", data.getTime());
|
||||
}
|
||||
if (readCount2 == 2) {
|
||||
timeMap.put("start2", data.getTime());
|
||||
}
|
||||
timeMap.put("start", data.getTime());
|
||||
// 雷达原始数据对象
|
||||
PrimaryRadarData primaryRadarData = new PrimaryRadarData();
|
||||
// 拷贝封装类属性到雷达原始数据对象
|
||||
|
|
@ -181,14 +154,15 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
|
||||
primaryRadarData.setRadarId(data.getData().get(0));
|
||||
primaryRadarData.setRadarLocation(radar.getRadarLocation());
|
||||
List<PrimaryRadarData> dataList = map.get(getMapKey(radar, modbusResponse.getNumber()));
|
||||
List<PrimaryRadarData> dataList = map.get(getMapKey(radar));
|
||||
//判断读取数据中是否携带标签
|
||||
if (!"0".equals(modbusResponse.getTagId())) {
|
||||
consecutiveZeros = 0;
|
||||
// 根据标签去数据库查询标签列表
|
||||
SysIdentifier sysIdentifier = identifierHashMap.get(tag);
|
||||
if (modbusResponse != null && modbusResponse.getNumber() == 1) {
|
||||
|
||||
//判断数据库查询结果是否有数据
|
||||
|
||||
if (sysIdentifier != null) {
|
||||
consecutiveZeros1 = 0;
|
||||
// 有数据将查询到的标识器配置属性放进原始数据对象
|
||||
primaryRadarData.setLadleNumber(sysIdentifier.getLadleNumber());
|
||||
primaryRadarData.setRadarIp(radar.getRadarIp());
|
||||
|
|
@ -196,28 +170,27 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
if (CollectionUtils.isEmpty(dataList)) {
|
||||
dataList = new ArrayList<>();
|
||||
dataList.add(primaryRadarData);
|
||||
if (data.getData().get(11) == 1) {
|
||||
map.put(getMapKey(radar, modbusResponse.getNumber()), dataList);
|
||||
}
|
||||
if (data.getData().get(11) == 2) {
|
||||
map.put(getMapKey(radar, modbusResponse.getNumber()), dataList);
|
||||
}
|
||||
}
|
||||
if (!Objects.equals(data.getData().get(0), dataList.get(dataList.size() - 1).getRadarId())) {
|
||||
long end = System.currentTimeMillis();
|
||||
Long dataStart = timeMap.get("noDataStart1");
|
||||
|
||||
System.out.println("突然读到另一个雷达id： " + "开始存储........" + "开始时间为：" + dataStart + "结束时间为：" + end);
|
||||
saveData(radar, map, readCount1, data.getTime(), end, modbusResponse.getNumber());
|
||||
dataList.clear();
|
||||
timeMap.put("noDataStart1", System.currentTimeMillis());
|
||||
map.remove(getMapKey(radar, modbusResponse.getNumber()));
|
||||
dataList.add(primaryRadarData);
|
||||
readCount1 = 1;
|
||||
map.put(getMapKey(radar), dataList);
|
||||
}
|
||||
// if (StringUtils.equals(modbusResponse.getTagId(), dataList.get(dataList.size() - 1).getTagId()) && Objects.equals(primaryRadarData.getRadarId(), dataList.get(dataList.size() - 1).getRadarId()) && Objects.equals(primaryRadarData.getRadarIp(), dataList.get(dataList.size() - 1).getRadarIp())) {
|
||||
// if (current - start >= 20000) {
|
||||
// // todo：存数据
|
||||
//
|
||||
// System.out.println("连续二十秒秒没收到数据：开始存储........" + "开始时间为：" + start + "结束时间为：" + current);
|
||||
// if (readCount > 100) {
|
||||
// saveData(radar, map, readCount, start, current);
|
||||
// readCount = 1;
|
||||
// }
|
||||
// start = System.currentTimeMillis();
|
||||
// }
|
||||
// dataList.clear();
|
||||
// dataList.add(primaryRadarData);
|
||||
// }
|
||||
if (modbusResponse.getNumber() == 1) {
|
||||
if (!StringUtils.equals(modbusResponse.getTagId(), dataList.get(dataList.size() - 1).getTagId())
|
||||
&& Objects.equals(primaryRadarData.getRadarIp(), dataList.get(dataList.size() - 1).getRadarIp())
|
||||
&& modbusResponse.getNumber() == 1) {
|
||||
&& !StringUtils.equals("0", dataList.get(dataList.size() - 1).getTagId())
|
||||
&& Objects.equals(primaryRadarData.getRadarId(), dataList.get(dataList.size() - 1).getRadarId())
|
||||
&& Objects.equals(primaryRadarData.getRadarIp(), dataList.get(dataList.size() - 1).getRadarIp())) {
|
||||
// todo：存数据
|
||||
long currentTimeMillis = System.currentTimeMillis();
|
||||
System.out.println("突然读到另一个标签：开始存储........"
|
||||
|
|
@ -225,68 +198,19 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
+ "此次雷达ip为：====" + primaryRadarData.getRadarIp() + "上次雷达ip为 =====" + dataList.get(dataList.size() - 1).getRadarIp()
|
||||
+ "此次雷达标签号为：====" + modbusResponse.getTagId() + "此次雷达标签号为：====" + dataList.get(dataList.size() - 1).getTagId()
|
||||
+ data.getTime() + "结束时间为：" + currentTimeMillis);
|
||||
saveData(radar, map, readCount1, timeMap.get("start1"), currentTimeMillis, modbusResponse.getNumber());
|
||||
saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis);
|
||||
dataList.clear();
|
||||
timeMap.put("start1", System.currentTimeMillis());
|
||||
map.remove(getMapKey(radar, 1));
|
||||
timeMap.put("noDataStart", System.currentTimeMillis());
|
||||
map.remove(getMapKey(radar));
|
||||
dataList.add(primaryRadarData);
|
||||
readCount1 = 1;
|
||||
}
|
||||
readCount1++;
|
||||
} else {
|
||||
//TODO
|
||||
//连续100次读取标签号为0
|
||||
consecutiveZeros1++;
|
||||
|
||||
if (50 <= consecutiveZeros1) {
|
||||
// todo：存数据
|
||||
// 没有配置过将铁包号置空
|
||||
primaryRadarData.setLadleNumber(null);
|
||||
primaryRadarData.setRadarIp(radar.getRadarIp());
|
||||
|
||||
// System.out.println("连续10次读取标签号为0：开始存储........" + radar + map + readCount + "开始时间为：" + timeMap.get("zero") + "结束时间为：" + noDataStart);
|
||||
saveData(radar, map, readCount1, timeMap.get("zero1"), noDataStart1, modbusResponse.getNumber());
|
||||
readCount1 = 1;
|
||||
map.remove(getMapKey(radar, modbusResponse.getNumber()));
|
||||
timeMap.put("zero1",System.currentTimeMillis());
|
||||
timeMap.put("noDataStart1", System.currentTimeMillis());
|
||||
consecutiveZeros1 = 0;
|
||||
if (CollectionUtils.isNotEmpty(dataList)) {
|
||||
dataList.clear();
|
||||
}
|
||||
|
||||
readCount = 1;
|
||||
}
|
||||
}
|
||||
noDataStart1 = current;
|
||||
}
|
||||
|
||||
if (modbusResponse != null && modbusResponse.getNumber() == 2) {
|
||||
if (sysIdentifier != null) {
|
||||
consecutiveZeros2 = 0;
|
||||
// 有数据将查询到的标识器配置属性放进原始数据对象
|
||||
primaryRadarData.setLadleNumber(sysIdentifier.getLadleNumber());
|
||||
primaryRadarData.setRadarIp(radar.getRadarIp());
|
||||
primaryRadarData.setType(sysIdentifier.getType().toString());
|
||||
if (CollectionUtils.isEmpty(dataList)) {
|
||||
dataList = new ArrayList<>();
|
||||
dataList.add(primaryRadarData);
|
||||
map.put(getMapKey(radar, modbusResponse.getNumber()), dataList);
|
||||
}
|
||||
if (!Objects.equals(data.getData().get(0), dataList.get(dataList.size() - 1).getRadarId())) {
|
||||
long end = System.currentTimeMillis();
|
||||
Long dataStart = timeMap.get("noDataStart2");
|
||||
|
||||
System.out.println("突然读到另一个雷达id： " + "开始存储........" + "开始时间为：" + dataStart + "结束时间为：" + end);
|
||||
saveData(radar, map, readCount2, data.getTime(), end, modbusResponse.getNumber());
|
||||
dataList.clear();
|
||||
timeMap.put("noDataStart2", System.currentTimeMillis());
|
||||
map.remove(getMapKey(radar, modbusResponse.getNumber()));
|
||||
dataList.add(primaryRadarData);
|
||||
readCount2 = 1;
|
||||
}
|
||||
if (modbusResponse.getNumber() == 2){
|
||||
if (!StringUtils.equals(modbusResponse.getTagId(), dataList.get(dataList.size() - 1).getTagId())
|
||||
&& Objects.equals(primaryRadarData.getRadarIp(), dataList.get(dataList.size() - 1).getRadarIp())
|
||||
&& modbusResponse.getNumber() == 2) {
|
||||
&& !StringUtils.equals("0", dataList.get(dataList.size() - 1).getTagId())
|
||||
&& Objects.equals(primaryRadarData.getRadarId(), dataList.get(dataList.size() - 1).getRadarId())
|
||||
&& Objects.equals(primaryRadarData.getRadarIp(), dataList.get(dataList.size() - 1).getRadarIp())) {
|
||||
// todo：存数据
|
||||
long currentTimeMillis = System.currentTimeMillis();
|
||||
System.out.println("突然读到另一个标签：开始存储........"
|
||||
|
|
@ -294,56 +218,60 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
+ "此次雷达ip为：====" + primaryRadarData.getRadarIp() + "上次雷达ip为 =====" + dataList.get(dataList.size() - 1).getRadarIp()
|
||||
+ "此次雷达标签号为：====" + modbusResponse.getTagId() + "此次雷达标签号为：====" + dataList.get(dataList.size() - 1).getTagId()
|
||||
+ data.getTime() + "结束时间为：" + currentTimeMillis);
|
||||
saveData(radar, map, readCount2, timeMap.get("start2"), currentTimeMillis, modbusResponse.getNumber());
|
||||
saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis);
|
||||
dataList.clear();
|
||||
timeMap.put("start2", System.currentTimeMillis());
|
||||
map.remove(getMapKey(radar, 2));
|
||||
timeMap.put("noDataStart", System.currentTimeMillis());
|
||||
map.remove(getMapKey(radar));
|
||||
dataList.add(primaryRadarData);
|
||||
readCount2 = 1;
|
||||
readCount = 1;
|
||||
}
|
||||
}
|
||||
readCount++;
|
||||
|
||||
if (!Objects.equals(data.getData().get(0), dataList.get(dataList.size() - 1).getRadarId())) {
|
||||
long end = System.currentTimeMillis();
|
||||
Long dataStart = timeMap.get("noDataStart");
|
||||
|
||||
System.out.println("突然读到另一个雷达id： " + "开始存储........" + "开始时间为：" + dataStart + "结束时间为：" + end);
|
||||
saveData(radar, map, readCount, data.getTime(), end);
|
||||
dataList.clear();
|
||||
timeMap.put("noDataStart", System.currentTimeMillis());
|
||||
map.remove(getMapKey(radar));
|
||||
dataList.add(primaryRadarData);
|
||||
readCount = 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
readCount2++;
|
||||
} else {
|
||||
//TODO
|
||||
//连续100次读取标签号为0
|
||||
consecutiveZeros2++;
|
||||
|
||||
if (50 <= consecutiveZeros2) {
|
||||
//连续10次读取标签号为0
|
||||
consecutiveZeros++;
|
||||
if (100 == consecutiveZeros) {
|
||||
// todo：存数据
|
||||
|
||||
// System.out.println("连续10次读取标签号为0：开始存储........" + radar + map + readCount + "开始时间为：" + timeMap.get("zero") + "结束时间为：" + noDataStart);
|
||||
saveData(radar, map, readCount, timeMap.get("zero"), noDataStart);
|
||||
readCount = 1;
|
||||
map.remove(getMapKey(radar));
|
||||
timeMap.put("noDataStart", System.currentTimeMillis());
|
||||
dataList.clear();
|
||||
consecutiveZeros = 0;
|
||||
}
|
||||
// 没有配置过将铁包号置空
|
||||
primaryRadarData.setLadleNumber(null);
|
||||
primaryRadarData.setRadarIp(radar.getRadarIp());
|
||||
|
||||
// System.out.println("连续10次读取标签号为0：开始存储........" + radar + map + readCount + "开始时间为：" + timeMap.get("zero") + "结束时间为：" + noDataStart);
|
||||
saveData(radar, map, readCount2, timeMap.get("zero2"), noDataStart2, modbusResponse.getNumber());
|
||||
readCount2 = 1;
|
||||
map.remove(getMapKey(radar, modbusResponse.getNumber()));
|
||||
timeMap.put("noDataStart2", System.currentTimeMillis());
|
||||
timeMap.put("zero2", System.currentTimeMillis());
|
||||
consecutiveZeros2 = 0;
|
||||
if (CollectionUtils.isNotEmpty(dataList)) {
|
||||
dataList.clear();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
noDataStart2 = current;
|
||||
}
|
||||
|
||||
CompletableFuture.runAsync(() -> {
|
||||
primaryRadarDataService.insertPrimaryRadarData(primaryRadarData);
|
||||
}, threadPoolTaskExecutor);
|
||||
|
||||
}
|
||||
noDataStart = current;
|
||||
} catch (Throwable e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveData(SysRadar radar, Map<String, List<PrimaryRadarData>> map, int count, long noStartTime, long endTime, Integer number) {
|
||||
private void saveData(SysRadar radar, Map<String, List<PrimaryRadarData>> map, int count, long noStartTime, long endTime) {
|
||||
Date start = new Date(noStartTime);
|
||||
Date end = new Date(endTime);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
|
|
@ -351,7 +279,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
String sqlEnd = sdf.format(end);
|
||||
try {
|
||||
|
||||
List<PrimaryRadarData> primaryRadarDataList = map.get(getMapKey(radar, number));
|
||||
List<PrimaryRadarData> primaryRadarDataList = map.get(getMapKey(radar));
|
||||
if (CollectionUtils.isNotEmpty(primaryRadarDataList)) {
|
||||
PrimaryRadarData maxData = primaryRadarDataList.stream().max(Comparator.comparingInt(PrimaryRadarData::getValue4)).get();
|
||||
|
||||
|
|
@ -384,8 +312,8 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
}
|
||||
|
||||
|
||||
private String getMapKey(SysRadar radar, Integer number) {
|
||||
return radar.getRadarIp() + "-" + number + "-" + radar.getId();
|
||||
private String getMapKey(SysRadar radar) {
|
||||
return radar.getRadarIp() + "-" + radar.getRadarNum() + "-" + radar.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -421,7 +349,6 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
*/
|
||||
public ModbusResponse getModbusResponse(DataResponse data) {
|
||||
ModbusResponse modbusResponse = new ModbusResponse();
|
||||
if (CollectionUtils.isNotEmpty(data.getData())) {
|
||||
modbusResponse.setRadarNum(data.getData().get(0).toString());
|
||||
modbusResponse.setTagId(data.getData().get(3).toString());
|
||||
modbusResponse.setValue1(data.getData().get(4));
|
||||
|
|
@ -434,8 +361,6 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
modbusResponse.setNumber(data.getData().get(11));
|
||||
return modbusResponse;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
private void oracleInsert(TsanaRadar tsanaRadar, SysRadar radar) {
|
||||
|
|
@ -487,6 +412,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
|
|||
}
|
||||
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
LocalDate currentDate = LocalDate.now();
|
||||
LocalDate twoDaysAgo = currentDate.minusDays(2);
|
||||
|
|
|
|||
Loading…
Reference in New Issue