forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-06-18 96d3ae20a572460e3dc226204398c44b4d0c8484 
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java


@@ -4,19 +4,8 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.moral.api.entity.Device;


import com.moral.api.entity.ManageAccount;


import com.moral.api.entity.MonitorPoint;


import com.moral.api.entity.Organization;


import com.moral.api.entity.SysDictData;


import com.moral.api.entity.SysDictType;


import com.moral.api.entity.Version;


import com.moral.api.mapper.DeviceMapper;


import com.moral.api.mapper.ManageAccountMapper;


import com.moral.api.mapper.MonitorPointMapper;


import com.moral.api.mapper.OrganizationMapper;


import com.moral.api.mapper.SysDictDataMapper;


import com.moral.api.mapper.SysDictTypeMapper;


import com.moral.api.entity.*;


import com.moral.api.mapper.*;


import com.moral.api.pojo.vo.device.DeviceVO;


import com.moral.api.service.DeviceService;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


@@ -31,6 +20,7 @@


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




@@ -80,6 +70,11 @@


    @Autowired


    private RedisTemplate redisTemplate;




    @Autowired


    private OrganizationUnitAlarmMapper organizationUnitAlarmMapper;




    @Autowired


    private VersionSensorUnitMapper versionSensorUnitMapper;




    /*


     * 从redis获取设备信息


@@ -127,6 +122,28 @@


        device.setOrganizationId(orgId);


        deviceMapper.insert(device);


        Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());


        //维护组织型号关系表


        QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>();


        queryOrganizationVersionWrapper.eq("organization_id",orgId);


        queryOrganizationVersionWrapper.eq("version_id",device.getDeviceVersionId());


        queryOrganizationVersionWrapper.eq("is_delete",Constants.NOT_DELETE);


        List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryOrganizationVersionWrapper);


        if(ObjectUtils.isEmpty(organizationUnitAlarms)){


            QueryWrapper<VersionSensorUnit> queryVersionSensorUnitWrapper =new QueryWrapper<>();


            queryVersionSensorUnitWrapper.eq("version_id",device.getDeviceVersionId());


            queryVersionSensorUnitWrapper.eq("is_delete",Constants.NOT_DELETE);


            List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper);


            if(!ObjectUtils.isEmpty(versionSensorUnits)){


                for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {


                    OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();


                    organizationUnitAlarm.setOrganizationId(orgId);


                    organizationUnitAlarm.setVersionId(device.getDeviceVersionId());


                    organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());


                    organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());


                    organizationUnitAlarmMapper.insert(organizationUnitAlarm);


                }


            }


        }


        //新增设备信息存入redis


        String mac = device.getMac();


        //从redis中删除设备信息