From f069ce1cc814e57c36b3c8d48d10af215350081b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 14 六月 2023 09:40:16 +0800
Subject: [PATCH] 修改盗电报警数据从mqtt接收 修改管线泄漏sql错误
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 29 ++++++++++++++++++++++++-----
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml | 2 +-
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/domain/ArdTubes.java | 1 +
3 files changed, 26 insertions(+), 6 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 82b68b3..60dae1c 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
@@ -13,6 +13,8 @@
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesMapper;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.UUID;
@@ -46,9 +48,9 @@
@Resource
ArdAlarmTubeMapper ardAlarmTubeMapper;
@Resource
- IArdAlarmTubeService ardAlarmTubeService;
- @Resource
ArdTubesMapper ardTubesMapper;
+ @Resource
+ ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
@Resource
ArdTubesDetailsMapper ardTubesDetailsMapper;
@Resource
@@ -122,10 +124,27 @@
@Override
@Async("alarmExecutor")
public void receiveAlarm(String topic, String message) {
+ String uuid = UUID.randomUUID().toString().replace("-", "");
switch (topic) {
+ case "stealelec":
+ ArdAlarmStealelec ardAlarmStealelec = JSONObject.parseObject(message, ArdAlarmStealelec.class);
+ ardAlarmStealelec.setId(uuid);
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmStealelec.getDescribe());
+ if(well!=null)
+ {
+ ardAlarmStealelec.setLongitude(well.getLongitude());
+ ardAlarmStealelec.setLatitude(well.getLatitude());
+ ardAlarmStealelec.setDeptId(well.getDeptId());
+ }
+ int insertaas = ardAlarmStealelecMapper.insert(ardAlarmStealelec);
+ if(insertaas>0)
+ {
+ log.info("stealelec鍏ュ簱鎴愬姛锛�" +ardAlarmStealelec);
+ }
+ break;
case "tube":
ArdAlarmTube ardAlarmTube = JSONObject.parseObject(message, ArdAlarmTube.class);
- ardAlarmTube.setId(UUID.randomUUID().toString().replace("-", ""));
+ ardAlarmTube.setId(uuid);
ArdTubesDetails atd = new ArdTubesDetails();
atd.setReelNumber(ardAlarmTube.getTubeId());
List<ArdTubesDetails> ardTubesDetails = ardTubesDetailsMapper.selectArdTubesDetailsList(atd);
@@ -143,9 +162,9 @@
ardAlarmTube.setAltitude(geoPoint.getAltitude());
}
}
- int i = ardAlarmTubeService.insertArdAlarmTube(ardAlarmTube);
+ int i = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
if (i > 0) {
- log.info("鍏ュ簱鎴愬姛锛�" + ardAlarmTube.toString());
+ log.info("tube鍏ュ簱鎴愬姛锛�" + ardAlarmTube);
}
break;
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/domain/ArdTubes.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/domain/ArdTubes.java
index 6da55c5..93d7d93 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/domain/ArdTubes.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/domain/ArdTubes.java
@@ -2,6 +2,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.experimental.Accessors;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index affe844..79a3317 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -144,9 +144,9 @@
COUNT ( aat.alarm_time ) OVER ( PARTITION BY tube_id ) AS total
FROM
ard_alarm_tube aat
- order by aat.alarm_time desc
WHERE
aat.alarm_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
+ order by aat.alarm_time desc
) T
WHERE T.rn = 1
</select>
--
Gitblit v1.9.3