From 99042da077ad98e38340f96cb03ffcf4d249ab87 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 01 十一月 2024 13:49:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/SuYuanService.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/yssh/service/SuYuanService.java b/src/main/java/com/yssh/service/SuYuanService.java
index 2d01143..0ff00b8 100644
--- a/src/main/java/com/yssh/service/SuYuanService.java
+++ b/src/main/java/com/yssh/service/SuYuanService.java
@@ -47,6 +47,15 @@
@Resource
private LocationService locService;
+ @Resource
+ private AlertConfigMapper alertConfigMapper;
+
+ private static HashMap<String, String> sites = new HashMap<>();
+
+ public double getJcyj() {
+ return alertConfigMapper.getAll().get(0).getJcyj();
+ }
+
//@Transactional
@Async("threadPoolTaskExecutor")
public void insertSuYuanDatasAsync(List<SuYuan> lists, String time) throws Exception {
@@ -103,7 +112,7 @@
}
public Map<String, Object> selectSuYuan100(String name, Date date) {
- Map<String, Object> result = new HashMap<String, Object>();
+ Map<String, Object> result = new HashMap<>();
MonitorPointPosition checkPoint = commonService.select3dCheckPointByName(name);
if (StringUtils.isNull(checkPoint)) {
return null;
@@ -117,7 +126,8 @@
}
if (suYuanMapper.isTableExists(dictRecord.getTableName()) == 0) return null;
- List<DistanceSuYuan> list = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> source = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> list = getList(ids3d, source);
AtomicInteger i = new AtomicInteger(0);
list.stream().forEach(s -> {
s.setName(checkPoint.getName());
@@ -136,6 +146,20 @@
return result;
}
+ private List<DistanceSuYuan> getList(List<String> ids3d, List<DistanceSuYuan> source) {
+ List<DistanceSuYuan> list = new ArrayList<>();
+ for (String id : ids3d) {
+ DistanceSuYuan suYuan = source.stream().filter(db -> id.equals(db.getId())).findFirst().orElse(null);
+ if (null == suYuan) {
+ String[] strs = id.split("_");
+ suYuan = new DistanceSuYuan(null, null, 0.0, id, Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), 0, 0, null, 0.0, 0.0, 0.0, 0.0);
+ }
+ list.add(suYuan);
+ }
+
+ return list;
+ }
+
public Map<String, Object> selectSuYuan200(String name, Date date) {
Map<String, Object> result = new HashMap<String, Object>();
MonitorPointPosition checkPoint = commonService.select3dCheckPointByName(name);
@@ -151,7 +175,8 @@
}
if (suYuanMapper.isTableExists(dictRecord.getTableName()) == 0) return null;
- List<DistanceSuYuan> list = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> source = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> list = getList(ids3d, source);
AtomicInteger i = new AtomicInteger(0);
list.stream().forEach(s -> {
s.setName(checkPoint.getName());
@@ -185,7 +210,8 @@
}
if (suYuanMapper.isTableExists(dictRecord.getTableName()) == 0) return null;
- List<DistanceSuYuan> list = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> source = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> list = getList(ids3d, source);
AtomicInteger i = new AtomicInteger(0);
list.stream().forEach(s -> {
s.setName(checkPoint.getName());
@@ -219,7 +245,8 @@
}
if (suYuanMapper.isTableExists(dictRecord.getTableName()) == 0) return null;
- List<DistanceSuYuan> list = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> source = suYuanMapper.getDistanceSuYuan(dictRecord.getTableName(), ids3d);
+ List<DistanceSuYuan> list = getList(ids3d, source);
AtomicInteger i = new AtomicInteger(0);
list.stream().forEach(s -> {
s.setName(checkPoint.getName());
@@ -263,7 +290,7 @@
calendar.add(Calendar.DATE, -7);
String start = DateUtils.getYyyyMmDdHh(calendar.getTime());
- return suYuanMapper.getNewMonitorData(checkPoint.getName(), start, end);
+ return qxshMapper.getNewMonitorData(checkPoint.getName(), start, end);
}
public int updateVocsName(Date date, String id, String vocsName) {
@@ -321,9 +348,29 @@
}
public String selectSuYuanIdByName(String name) {
- MonitorPointPosition mpp = commonService.select3dCheckPointByName(name);
- if (null == mpp) return null;
+ if (sites.containsKey(name)) {
+ return sites.get(name);
+ }
- return mpp.getId().substring(0, mpp.getId().lastIndexOf("_") + 1) + "0";
+ MonitorPointPosition mpp = commonService.select3dCheckPointByName(name);
+ if (null == mpp) {
+ return null;
+ }
+
+ String suYuanId = mpp.getId().substring(0, mpp.getId().lastIndexOf("_") + 1) + "0";
+ if (!sites.containsKey(name)) {
+ sites.put(name, suYuanId);
+ }
+
+ return suYuanId;
+ }
+
+ /**
+ * 鏍规嵁ID鏌ヨ蹇�熸函婧�
+ */
+ public List<SuYuanFast> selectFastById(String id, Date date) {
+ String time = DateUtils.getYyyyMmDdHhMmSs(date);
+
+ return suYuanMapper.selectFastById(id, time);
}
}
--
Gitblit v1.9.3