From c62d8312594402fef578a21bfdf03555a83c056c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 06 七月 2023 09:53:47 +0800
Subject: [PATCH] 增加forest
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index c6af0b3..f84040c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -100,6 +100,8 @@
countMap.put("1003", count1003);
int count1004 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "鐑簮妫�娴�");
countMap.put("1004", count1004);
+ int count1007 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
+ countMap.put("1007", count1007);
int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
map.put("20000", countMap);
@@ -175,6 +177,20 @@
.setTotal(ardAlarmRadar.getTotal());
return globalAlarmData;
}).collect(Collectors.toList());
+ case 1007:
+ ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
+ return ardAlarmRadars.stream()
+ .map(ardAlarmRadar -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmRadar.getId())
+ .setName(ardAlarmRadar.getName())
+ .setAlarmTime(ardAlarmRadar.getAlarmTime())
+ .setLongitude(ardAlarmRadar.getLongitude())
+ .setLatitude(ardAlarmRadar.getLatitude())
+ .setCount(ardAlarmRadar.getCount())
+ .setTotal(ardAlarmRadar.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
case 1014:
List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
return ardAlarmTubes.stream()
@@ -235,6 +251,13 @@
aarr.setPageSize(pageSize);
aarr.setAlarmType("鐑簮妫�娴�");
return ardAlarmRadarMapper.selectArdAlarmRadarList(aarr);
+ case 1007:
+ ArdAlarmRadar aarrr = new ArdAlarmRadar();
+ aarrr.setParams(params);
+ aarrr.setPageNum(pageNum);
+ aarrr.setPageSize(pageSize);
+ aarrr.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
+ return ardAlarmRadarMapper.selectArdAlarmRadarList(aarrr);
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
@@ -266,16 +289,9 @@
return ardAlarmStealelec;
}
case 1003:
- ArdAlarmRadar ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
- if (StringUtils.isNotNull(ardAlarmRadar)) {
- String name = ardAlarmRadar.getName();
- String alarmType=ardAlarmRadar.getAlarmType();
- String alarmTime=fmt.format(ardAlarmRadar.getAlarmTime());
- ardAlarmRadarMapper.updateViewTimeByCondition(name,alarmType, alarmTime,DateUtils.getTime());
- return ardAlarmRadar;
- }
case 1004:
- ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
+ case 1007:
+ ArdAlarmRadar ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
if (StringUtils.isNotNull(ardAlarmRadar)) {
String name = ardAlarmRadar.getName();
String alarmType=ardAlarmRadar.getAlarmType();
@@ -382,7 +398,7 @@
String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
ardAlarmRadar.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");//鎶ヨ鐐瑰悕绉�
ardAlarmRadar.setCreateTime(new Date());//鎺ユ敹鏃堕棿
- double[] coordinate=new double[]{ardAlarmRadar.getLongitude(),ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
+
String alarmType = "";
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
@@ -391,7 +407,20 @@
case "鐑簮妫�娴�":
alarmType = "sys_radar_fire";
break;
+ case "闆疯揪鎶芥补鏈哄仠鏈�":
+ alarmType = "sys_radar_pumpshutdown";
+ ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+ if(StringUtils.isNotNull(ardAlarmpointsWell)) {
+ ardAlarmRadar.setLongitude(ardAlarmpointsWell.getLongitude());
+ ardAlarmRadar.setLatitude(ardAlarmpointsWell.getLatitude());
+ }
+ break;
}
+ if(StringUtils.isNull(ardAlarmRadar.getLongitude())||StringUtils.isNull(ardAlarmRadar.getLatitude()))
+ {
+ continue;
+ }
+ double[] coordinate=new double[]{ardAlarmRadar.getLongitude(),ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
//鍒ゆ柇褰撳墠鎶ヨ鐐�5鍒嗛挓鍐呮槸鍚﹀凡寮曞
ardAlarmRadar.setGuideFlag(1);
ArdAlarmRadar AlarmRadar = ardAlarmRadarMapper.getArdAlarmRadarWithGuide(ardAlarmRadar);
--
Gitblit v1.9.3