screen-api SQL优化 screen-manage 日志模块更新，SQL优化

kaiyu

2021-08-25 41622b7aa1d948040b0f8ea024aece42d5a518a2

 screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java

@@ -1,17 +1,23 @@
package com.moral.api.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Device;
import com.moral.api.entity.OrganizationUnitAlarm;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.Version;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.service.DeviceService;
import com.moral.api.service.OrganizationUnitAlarmService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -28,12 +34,55 @@

    @Autowired
    RedisTemplate redisTemplate;
    @Autowired
    DeviceService deviceService;
    @Autowired
    OrganizationUnitAlarmMapper organizationUnitAlarmMapper;

    /**
     * @Description: 从缓存查询设备报警信息
     * @Param: [mac]
     * @return: java.util.List<com.moral.api.entity.Sensor>
     * @Author: 陈凯裕
     * @Date: 2021/8/23
     */
    @Override
    public List<Sensor> queryAlarmLevel(String mac) {
        Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
        Version version = device.getVersion();
        List<Sensor> sensors = version.getSensors();
        //如果缓存中不存在则在数据库中查询
        if (ObjectUtils.isEmpty(sensors)) {
            sensors = queryAlarmLevelFromDb(mac);
        }
        return sensors;
    }


    /**
     * @Description: 从数据库获取设备报警信息
     * @Param: [mac]
     * @return: java.util.List<com.moral.api.entity.Sensor>
     * @Author: 陈凯裕
     * @Date: 2021/8/23
     */
    private List<Sensor> queryAlarmLevelFromDb(String mac) {
        Device device = deviceService.getDeviceByMac(mac);
        Integer organizationId = device.getOrganizationId();
        Integer deviceVersionId = device.getDeviceVersionId();
        QueryWrapper<OrganizationUnitAlarm> wrapper = new QueryWrapper<>();
        wrapper.eq("organization_id", organizationId);
        wrapper.eq("version_id", deviceVersionId);
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(wrapper);
        List<Sensor> sensors = new ArrayList<>();
        //仅需要sensorcode和alarmlevel数据
        for (OrganizationUnitAlarm organizationUnitAlarm : organizationUnitAlarms) {
            Sensor sensor = new Sensor();
            sensor.setCode(organizationUnitAlarm.getSensorCode());
            sensor.setAlarmLevel(organizationUnitAlarm.getAlarmLevel());
            sensors.add(sensor);
        }
        return sensors;
    }
}