aijinhui
2023-10-18 3a4330d7095e4177b9ffee0ca1749c22711bc955
ard-work/src/main/java/com/ruoyi/statistical/service/impl/StatisticalServiceImpl.java
@@ -22,7 +22,7 @@
import com.ruoyi.device.radar.domain.ArdEquipRadar;
import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
import com.ruoyi.statistical.domain.ArdPumpStatus;
import com.ruoyi.statistical.mapper.PumpStatusMapper;
import com.ruoyi.statistical.mapper.ArdPumpStatusMapper;
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.param.Para;
import com.ruoyi.statistical.service.StatisticalService;
@@ -74,7 +74,7 @@
    @Autowired
    private ArdCamerasMapper camerasMapper;
    @Autowired
    private PumpStatusMapper pumpStatusMapper;
    private ArdPumpStatusMapper ardPumpStatusMapper;
    @Override
@@ -382,14 +382,14 @@
        List<TenVo> list = new ArrayList<>();
        QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("alarm_type","运行");
        int y = pumpStatusMapper.selectCount(queryWrapper);
        int y = ardPumpStatusMapper.selectCount(queryWrapper);
        TenVo tenVo = new TenVo();
        tenVo.setName("运行");
        tenVo.setValue(y);
        list.add(tenVo);
        QueryWrapper<ArdPumpStatus> queryWrapper1 = new QueryWrapper<>();
        queryWrapper1.eq("alarm_type","停机");
        int t = pumpStatusMapper.selectCount(queryWrapper1);
        int t = ardPumpStatusMapper.selectCount(queryWrapper1);
        TenVo tenVo1 = new TenVo();
        tenVo1.setName("停机");
        tenVo1.setValue(t);
@@ -407,7 +407,7 @@
                JSONObject j = list.get(i);
                QueryWrapper<ArdPumpStatus> queryWrapper = new QueryWrapper<>();
                queryWrapper.eq("target_id",j.getInteger("targetId")).eq("name",j.getString("name"));
                ArdPumpStatus ardPumpStatus1 = pumpStatusMapper.selectOne(queryWrapper);
                ArdPumpStatus ardPumpStatus1 = ardPumpStatusMapper.selectOne(queryWrapper);
                if(ardPumpStatus1 ==null){
                    ArdPumpStatus ardPumpStatus = new ArdPumpStatus();
                    ardPumpStatus.setTargetId(j.getInteger("targetId"));
@@ -418,7 +418,7 @@
                        ardPumpStatus.setAlarmType(j.getString("alarm"));
                    }
                    ardPumpStatus.setAlarmTime(alarmTime);
                    pumpStatusMapper.insert(ardPumpStatus);
                    ardPumpStatusMapper.insert(ardPumpStatus);
                }else {
                    String alarmType = ardPumpStatus1.getAlarmType();
                    Boolean bo = false;
@@ -434,7 +434,7 @@
                    if(!bo){
                        ardPumpStatus1.setAlarmType(j.getString("alarmType"));
                        ardPumpStatus1.setAlarmTime(alarmTime);
                        pumpStatusMapper.updateById(ardPumpStatus1);
                        ardPumpStatusMapper.updateById(ardPumpStatus1);
                    }
                }
            }