Merge branch 'refs/heads/v16.3_line_warn_20240528_weather' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempLineWarnController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Author: aiqingguo
@@ -103,13 +104,13 @@ public class TempLineWarnController {
         if (feignAddressVO.getSendAddress()!=null
                 && StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
             redisTemplate.opsForValue().set(REDIS_WEATHER + feignAddressVO.getSendAddress().getCityCode(), weather);
-            redisTemplate.expire(REDIS_WEATHER + feignAddressVO.getSendAddress().getCityCode(), 60*60, null);
+            redisTemplate.expire(REDIS_WEATHER + feignAddressVO.getSendAddress().getCityCode(), 60*60, TimeUnit.SECONDS);
         }
 
         if (feignAddressVO.getReceiveAddress()!=null
                 && StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
             redisTemplate.opsForValue().set(REDIS_WEATHER + feignAddressVO.getReceiveAddress().getCityCode(), weather);
-            redisTemplate.expire(REDIS_WEATHER + feignAddressVO.getReceiveAddress().getCityCode(), 60*60, null);
+            redisTemplate.expire(REDIS_WEATHER + feignAddressVO.getReceiveAddress().getCityCode(), 60*60, TimeUnit.SECONDS);
         }
 
         return Result.ok();