aijinhui
2023-10-18 1d69c4b7da499b1d80b47fda9b275a795a8a7063
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.statistical.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarm.access.mapper.ArdAlarmAccessMapper;
import com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper;
@@ -22,7 +21,7 @@
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
import com.ruoyi.device.radar.domain.ArdEquipRadar;
import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
import com.ruoyi.statistical.domain.PumpStatus;
import com.ruoyi.statistical.domain.ArdPumpStatus;
import com.ruoyi.statistical.mapper.PumpStatusMapper;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.param.Para;
@@ -381,14 +380,14 @@
    @Override
    public List<TenVo> pump() {
        List<TenVo> list = new ArrayList<>();
        QueryWrapper<PumpStatus> queryWrapper = new QueryWrapper<>();
        QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("alarm_type","运行");
        int y = pumpStatusMapper.selectCount(queryWrapper);
        TenVo tenVo = new TenVo();
        tenVo.setName("运行");
        tenVo.setValue(y);
        list.add(tenVo);
        QueryWrapper<PumpStatus> queryWrapper1 = new QueryWrapper<>();
        QueryWrapper<ArdPumpStatus> queryWrapper1 = new QueryWrapper<>();
        queryWrapper1.eq("alarm_type","停机");
        int t = pumpStatusMapper.selectCount(queryWrapper1);
        TenVo tenVo1 = new TenVo();
@@ -406,22 +405,22 @@
        if(list.size()>0){
            for (int i = 0; i < list.size(); i++) {
                JSONObject j = list.get(i);
                QueryWrapper<PumpStatus> queryWrapper = new QueryWrapper<>();
                QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("target_id",j.getInteger("targetId")).eq("name",j.getString("name"));
                PumpStatus pumpStatus1 = pumpStatusMapper.selectOne(queryWrapper);
                if(pumpStatus1==null){
                    PumpStatus pumpStatus = new PumpStatus();
                    pumpStatus.setTargetId(j.getInteger("targetId"));
                    pumpStatus.setName(j.getString("name"));
                ArdPumpStatus ardPumpStatus1 = pumpStatusMapper.selectOne(queryWrapper);
                if(ardPumpStatus1 ==null){
                    ArdPumpStatus ardPumpStatus = new ArdPumpStatus();
                    ardPumpStatus.setTargetId(j.getInteger("targetId"));
                    ardPumpStatus.setName(j.getString("name"));
                    if(j.containsKey("alarmType")){
                        pumpStatus.setAlarmType(j.getString("alarmType"));
                        ardPumpStatus.setAlarmType(j.getString("alarmType"));
                    }else if(j.containsKey("alarm")){
                        pumpStatus.setAlarmType(j.getString("alarm"));
                        ardPumpStatus.setAlarmType(j.getString("alarm"));
                    }
                    pumpStatus.setAlarmTime(alarmTime);
                    pumpStatusMapper.insert(pumpStatus);
                    ardPumpStatus.setAlarmTime(alarmTime);
                    pumpStatusMapper.insert(ardPumpStatus);
                }else {
                    String alarmType = pumpStatus1.getAlarmType();
                    String alarmType = ardPumpStatus1.getAlarmType();
                    Boolean bo = false;
                    if(j.containsKey("alarmType")){
                        if(alarmType.equals(j.getString("alarmType"))){
@@ -433,9 +432,9 @@
                        }
                    }
                    if(!bo){
                        pumpStatus1.setAlarmType(j.getString("alarmType"));
                        pumpStatus1.setAlarmTime(alarmTime);
                        pumpStatusMapper.updateById(pumpStatus1);
                        ardPumpStatus1.setAlarmType(j.getString("alarmType"));
                        ardPumpStatus1.setAlarmTime(alarmTime);
                        pumpStatusMapper.updateById(ardPumpStatus1);
                    }
                }
            }