screen-manage kafka消费者添加判断mac功能

kaiyu

2021-07-14 1052b3f30916f86415ecdab45158afc71bdfb188

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

@@ -3,15 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageRole;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.VersionSensorUnit;
import com.moral.api.entity.*;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.mapper.SysDictDataMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.service.SensorService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
@@ -52,6 +51,9 @@

    @Autowired(required = false)
    private SysDictDataMapper sysDictDataMapper;

    @Autowired(required = false)
    private OrganizationUnitAlarmMapper organizationUnitAlarmMapper;

    @Autowired
    LogUtils logUtils;
@@ -131,6 +133,16 @@
            return resultMap;
        }
        sensorMapper.updateSensor(updateSensorMap);
        if (!ObjectUtils.isEmpty(updateSensorMap.get("code"))&&!oldSensor.getCode().equals(updateSensorMap.get("code"))){
            QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
            wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
            wrapper_OUA.eq("sensor_code",oldSensor.getCode());
            OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
            organizationUnitAlarm.setSensorCode(updateSensorMap.get("code").toString());
            organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
            //刷新deviceInfo缓存
            CacheUtils.refreshDeviceAlarmInfo();
        }
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改因子:"+oldSensor.getName()+";";
        for (Object key:updateSensorMap.keySet()) {
@@ -269,6 +281,14 @@
        VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
        versionSensorUnit.setIsDelete(Constants.DELETE);
        versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
        if (!ObjectUtils.isEmpty(sensor.getCode())&&!sensor.getCode().equals("")){
            QueryWrapper<OrganizationUnitAlarm> wrapper_OUA = new QueryWrapper<>();
            wrapper_OUA.eq("is_delete",Constants.NOT_DELETE);
            wrapper_OUA.eq("sensor_code",sensor.getCode());
            OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
            organizationUnitAlarm.setIsDelete(Constants.DELETE);
            organizationUnitAlarmMapper.update(organizationUnitAlarm,wrapper_OUA);
        }
        //操作插入日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "删除因子:"+sensor.getName()+";";
@@ -329,6 +349,7 @@
        return resultMap;
    }

    @Override
    public Map<String,Sensor> getAllSensorFromCache(){
        Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
        if(ObjectUtils.isEmpty(sensors))
@@ -336,6 +357,12 @@
        //刷新缓存
        refreshCache(sensors);
        return sensors;
    }

    @Override
    public void refreshCache(){
        Map<String, Sensor> sensors = getAllSensorFromDB();
        refreshCache(sensors);
    }

    private Map<String,Sensor> getAllSensorFromDB(){
@@ -347,11 +374,6 @@
            result.put(sensor.getCode(),sensor);
        }
        return result;
    }

    private void refreshCache(){
        Map<String, Sensor> sensors = getAllSensorFromDB();
        refreshCache(sensors);
    }

    private void refreshCache(Map<String,Sensor> sensors){