forked from moral

blame | history | patch | commit | commitdiff | ignore whitespace
lizijie
2021-09-03 659b91b554ba5e98b6fffa045231f5aa3fb4ab9e 
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java


@@ -428,8 +428,8 @@


        if (!ObjectUtils.isEmpty(adjustFormula)) {


            Map<String, Object> deviceInfo = getDeviceByMac(mac);


            Map<String, Object> monitorPoint = (Map<String, Object>) deviceInfo.get("monitorPoint");


            Object areaCode = monitorPoint.get("areaCode");


            Object cityCode = monitorPoint.get("cityCode");


            String areaCode = monitorPoint.get("areaCode").toString();


            String cityCode = monitorPoint.get("cityCode").toString();




            Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);


            if (ObjectUtils.isEmpty(aqiMap)) {


@@ -448,8 +448,8 @@


        Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);


        if (!ObjectUtils.isEmpty(adjustFormula)) {


            Organization organization = specialDeviceMapper.selectOrgByMac(mac);


            Integer areaCode = organization.getAreaCode();


            Integer cityCode = organization.getCityCode();


            String areaCode = organization.getAreaCode().toString();


            String cityCode = organization.getCityCode().toString();


            Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);


            if (ObjectUtils.isEmpty(aqiMap)) {


                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);