lizijie
2021-09-16 b7f5fd4000d644d117a0936dbcc2bfc56bfab4f0
新建特殊设备DTO类,存放保存到redis的数据
1 files added
3 files modified
155 ■■■■■ changed files
screen-common/src/main/java/com/moral/constant/RedisConstants.java 5 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/pojo/redisBean/SpecialDeviceInfoDTO.java 41 ●●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/SpecialDeviceService.java 4 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java 105 ●●●● patch | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/RedisConstants.java
@@ -35,6 +35,11 @@
    public static final String DEVICE = "device";
    /*
     * redis中特殊设备信息key
     * */
    public static final String SPECIAL_DEVICE = "special_device";
    /*
     * 存储设备显示单位,报警等级以及单位转换公式
     * 数据类型:hash
     * key:mac
screen-manage/src/main/java/com/moral/api/pojo/redisBean/SpecialDeviceInfoDTO.java
New file
@@ -0,0 +1,41 @@
package com.moral.api.pojo.redisBean;
import com.moral.api.entity.*;
import lombok.Data;
import java.util.List;
/**
 * @program: screen
 * @description: 特殊设备存入redis实体类
 * @author: lizijie
 * @create: 2021-09-14 16:41
 **/
@Data
public class SpecialDeviceInfoDTO {
    /**
     * 特殊设备
     */
    private SpecialDevice specialDevice;
    /**
     * 政府站点
     */
    private GovMonitorPoint govMonitorPoint;
    /**
     * 型号
     */
    private Version version;
    /**
     * 维护人
     */
    private List<ManageAccount> operates;
    /**
     * 组织
     */
    private Organization organization;
}
screen-manage/src/main/java/com/moral/api/service/SpecialDeviceService.java
@@ -2,6 +2,7 @@
import com.moral.api.entity.SpecialDevice;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.redisBean.SpecialDeviceInfoDTO;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -31,4 +32,7 @@
    //根据设备id查询设备组织,维护人等信息
    Map<String, Object> selectDeviceInfoById(Integer deviceId);
    //根据设备id查询设备组织,维护人等信息
    SpecialDeviceInfoDTO selectDeviceInfoDTOById(Integer deviceId);
}
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
import com.moral.api.pojo.redisBean.SpecialDeviceInfoDTO;
import com.moral.api.pojo.vo.device.DeviceVO;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -78,22 +79,22 @@
    /*
     * 从redis获取设备信息
     * */
    private Map<String, Object> getDeviceInfoFromRedis(String mac) {
        return (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
    private SpecialDeviceInfoDTO getDeviceInfoFromRedis(String mac) {
        return (SpecialDeviceInfoDTO) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE, mac);
    }
    /*
     * 设备信息存入redis
     */
    private void setDeviceInfoToRedis(String mac, Map<String, Object> deviceInfo) {
        redisTemplate.opsForHash().put(RedisConstants.DEVICE, mac, deviceInfo);
    private void setDeviceInfoToRedis(String mac, SpecialDeviceInfoDTO specialDeviceInfoDTO) {
        redisTemplate.opsForHash().put(RedisConstants.SPECIAL_DEVICE, mac, specialDeviceInfoDTO);
    }
    /*
     * 从redis删除设备信息
     */
    private void delDeviceInfoFromRedis(String mac) {
        redisTemplate.opsForHash().delete(RedisConstants.DEVICE, mac);
        redisTemplate.opsForHash().delete(RedisConstants.SPECIAL_DEVICE, mac);
    }
    @Override
@@ -321,7 +322,8 @@
            }
            logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
        }
        Map<String, Object> deviceInfo = selectDeviceInfoById(specialDevice.getId());
        //Map<String, Object> deviceInfo = selectDeviceInfoById(specialDevice.getId());
        SpecialDeviceInfoDTO specialDeviceInfoDTO = selectDeviceInfoDTOById(specialDevice.getId());
        //维护组织型号关系表
        insertOrganizationUnitAlarm(specialDevice.getOrganizationId(), specialDevice.getDeviceVersionId());
        //新增设备信息存入redis
@@ -329,7 +331,7 @@
        //从redis中删除设备信息
        delDeviceInfoFromRedis(mac1);
        //设备信息存入redis
        setDeviceInfoToRedis(mac1, deviceInfo);
        setDeviceInfoToRedis(mac1, specialDeviceInfoDTO);
        //刷新deviceInfo缓存
        CacheUtils.refreshSpecialDeviceAlarmInfo();
        //操作日志记录
@@ -361,9 +363,9 @@
        }
        //从redis中删除设备信息
        delDeviceInfoFromRedis(oleMac);
        Map<String, Object> deviceInfo = selectDeviceInfoById(specialDeviceId);
        SpecialDeviceInfoDTO specialDeviceInfoDTO = selectDeviceInfoDTOById(specialDevice.getId());
        //设备信息存入redis
        setDeviceInfoToRedis(updateSpecialDevice.getMac(), deviceInfo);
        setDeviceInfoToRedis(updateSpecialDevice.getMac(), specialDeviceInfoDTO);
        //刷新deviceInfo缓存
        CacheUtils.refreshSpecialDeviceAlarmInfo();
        QueryWrapper<SpecialDeviceHistory> wrapper_specialDeviceHistory = new QueryWrapper<>();
@@ -474,38 +476,53 @@
    @Override
    public Map<String, Object> selectDeviceInfoById(Integer deviceId) {
        return null;
    }
    @Override
    public SpecialDeviceInfoDTO selectDeviceInfoDTOById(Integer deviceId) {
        String mac = specialDeviceMapper.selectById(deviceId).getMac();
        Map<String, Object> specialDeviceInfo = getDeviceInfoFromRedis(mac);
        SpecialDeviceInfoDTO specialDeviceInfoDTO = new SpecialDeviceInfoDTO();
        SpecialDeviceInfoDTO specialDeviceInfoDTORedis = getDeviceInfoFromRedis(mac);
        //先从redis中取
        if (specialDeviceInfo != null) {
            return specialDeviceInfo;
        if (specialDeviceInfoDTORedis != null) {
            return specialDeviceInfoDTORedis;
        }
        specialDeviceInfo = new LinkedHashMap<>();
        //DeviceVO device = deviceMapper.selectDeviceInfoById(deviceId);
        //存放特殊设备信息
        SpecialDevice specialDeviceInfo = new SpecialDevice();
        SpecialDevice specialDevice = specialDeviceMapper.selectById(deviceId);
        //设备
        specialDeviceInfo.put("id", specialDevice.getId());
        specialDeviceInfo.put("name", specialDevice.getName());
        specialDeviceInfo.put("mac", specialDevice.getMac());
        specialDeviceInfo.put("createTime", DateUtils.dateToDateString(specialDevice.getCreateTime()));
        specialDeviceInfo.put("guid", specialDevice.getGuid());
        System.out.println(specialDevice);
        /*specialDeviceInfo.setId(specialDevice.getId());
        specialDeviceInfo.setName(specialDevice.getName());
        specialDeviceInfo.setMac(specialDevice.getMac());
        specialDeviceInfo.setCreateTime(specialDevice.getCreateTime());*/
        specialDeviceInfoDTO.setSpecialDevice(specialDevice);
        //扩展字段
        //specialDeviceInfo.put("extend", device.getExtend());
        //存放政府站点信息
        GovMonitorPoint govMonitorPointInfo = new GovMonitorPoint();
        QueryWrapper<GovMonitorPoint> wrapper_govMonitorPoint = new QueryWrapper<>();
        wrapper_govMonitorPoint.eq("is_delete",Constants.NOT_DELETE);
        wrapper_govMonitorPoint.eq("guid",specialDevice.getGuid());
        GovMonitorPoint govMonitorPoint = govMonitorPointMapper.selectOne(wrapper_govMonitorPoint);
        /*govMonitorPointInfo.setId(govMonitorPoint.getId());
        govMonitorPointInfo.setGuid(govMonitorPoint.getGuid());
        govMonitorPointInfo.setName(govMonitorPoint.getName());*/
        specialDeviceInfoDTO.setGovMonitorPoint(govMonitorPoint);
        //型号
        Map<String, Object> versionInfo = new LinkedHashMap<>();
        //存放型号信息
        Version versionInfo = new Version();
        Version version = versionMapper.selectById(specialDevice.getDeviceVersionId());
        versionInfo.put("id", version.getId());
        versionInfo.put("name", version.getName());
        specialDeviceInfo.put("version", versionInfo);
        /*versionInfo.setId(version.getId());
        versionInfo.setName(version.getName());*/
        specialDeviceInfoDTO.setVersion(version);
        //维护人
        List<Map<String, Object>> operatorsInfo = new ArrayList<>();
        //存放维护人
        List<ManageAccount> operatorsInfo = new ArrayList<>();
        String operateIds = specialDevice.getOperateIds();
        if (!ObjectUtils.isEmpty(operateIds)){
            String[] operateIdArr = operateIds.split(",");
            if (operateIdArr.length>0){
            if (operateIdArr.length > 0){
                List<Integer> operateIdList = new ArrayList<>();
                for (int i = 0; i < operateIdArr.length; i++){
                    operateIdList.add(Integer.parseInt(operateIdArr[i]));
@@ -513,29 +530,19 @@
                QueryWrapper<ManageAccount> wapper_manageAccount = new QueryWrapper<>();
                wapper_manageAccount.eq("is_delete",Constants.NOT_DELETE);
                wapper_manageAccount.in("id",operateIdList);
                List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wapper_manageAccount);
                for (ManageAccount manageAccount:manageAccounts) {
                    Map<String,Object> operateMap = new HashMap<>();
                    operateMap.put("id",manageAccount.getId());
                    operateMap.put("name",manageAccount.getUserName());
                    operatorsInfo.add(operateMap);
                }
                operatorsInfo = manageAccountMapper.selectList(wapper_manageAccount);
            }
        }
        specialDeviceInfo.put("operators", operatorsInfo);
        specialDeviceInfoDTO.setOperates(operatorsInfo);
        //组织
        Map<String, Object> orgInfo = new LinkedHashMap<>();
        Organization organization = organizationMapper.selectById(specialDevice.getOrganizationId());
        orgInfo.put("id", organization.getId());
        orgInfo.put("name", organization.getName());
        orgInfo.put("areaCode", organization.getAreaCode());
        orgInfo.put("cityCode", organization.getCityCode());
        orgInfo.put("provinceCode", organization.getProvinceCode());
        specialDeviceInfo.put("organization", orgInfo);
        //存放组织
        Organization organizationInfo = new Organization();
        organizationInfo = organizationMapper.selectById(specialDevice.getOrganizationId());
        specialDeviceInfoDTO.setOrganization(organizationInfo);
        setDeviceInfoToRedis(mac, specialDeviceInfo);
        return specialDeviceInfo;
        System.out.println("========================");
        System.out.println(specialDeviceInfoDTO);
        return specialDeviceInfoDTO;
    }
    private void insertOrganizationUnitAlarm(Integer orgId, Integer versionId) {