fix:补偿提交

cjl

2023-10-13 100690a225167806a08f64eafff3326564a7154a

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

@@ -546,7 +546,8 @@

    @Override
    public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
        String mac = deviceData.remove("mac").toString();
//        String mac = deviceData.remove("mac").toString();
        String mac = deviceData.get("mac").toString();
        //从redis获取校准公式
        Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
        if (!org.springframework.util.ObjectUtils.isEmpty(adjustFormula)) {
@@ -567,7 +568,7 @@
            if (null != govMpInfo && null != govMpInfo.get("guid")) {
                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
            }
            return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
            return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
        }
        deviceData.remove("DataTime");
        return deviceData;