修改盗电报警数据从mqtt接收 修改管线泄漏sql错误

‘liusuyi’

2023-06-14 f069ce1cc814e57c36b3c8d48d10af215350081b

修改盗电报警数据从mqtt接收
修改管线泄漏sql错误

 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;
        }

 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;

 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>