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

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

@@ -104,15 +104,17 @@ public class TempLineWarnController {
         if (addressOptional.isEmpty()) {return Result.ok();}
         FeignAddressVO feignAddressVO = addressOptional.get();
 
-        if (feignAddressVO.getSendAddress()!=null
-                && StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
-            redisTemplate.opsForValue().set(REDIS_WEATHER + feignAddressVO.getSendAddress().getCityCode(), weather);
+        if (feignAddressVO.getSendAddress()!=null){
+            String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
+                    feignAddressVO.getSendAddress().getLatitude());
+            redisTemplate.opsForValue().set(REDIS_WEATHER + cityCode, weather);
             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);
+        if (feignAddressVO.getReceiveAddress()!=null){
+            String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
+                    feignAddressVO.getReceiveAddress().getLatitude());
+            redisTemplate.opsForValue().set(REDIS_WEATHER + cityCode, weather);
             redisTemplate.expire(REDIS_WEATHER + feignAddressVO.getReceiveAddress().getCityCode(), 60*60, TimeUnit.SECONDS);
         }
 
@@ -128,15 +130,16 @@ public class TempLineWarnController {
         if (addressOptional.isEmpty()) {return Result.ok();}
         FeignAddressVO feignAddressVO = addressOptional.get();
 
-
-        if (feignAddressVO.getSendAddress()!=null
-                && StringUtils.isNotBlank(feignAddressVO.getSendAddress().getCityCode())){
-            redisTemplate.delete(REDIS_WEATHER + feignAddressVO.getSendAddress().getCityCode());
+        if (feignAddressVO.getSendAddress()!=null){
+            String cityCode = gdUtils.getCity(feignAddressVO.getSendAddress().getLongitude(),
+                    feignAddressVO.getSendAddress().getLatitude());
+            redisTemplate.delete(REDIS_WEATHER + cityCode);
         }
 
-        if (feignAddressVO.getReceiveAddress()!=null
-                && StringUtils.isNotBlank(feignAddressVO.getReceiveAddress().getCityCode())){
-            redisTemplate.delete(REDIS_WEATHER + feignAddressVO.getReceiveAddress().getCityCode());
+        if (feignAddressVO.getReceiveAddress()!=null){
+            String cityCode = gdUtils.getCity(feignAddressVO.getReceiveAddress().getLongitude(),
+                    feignAddressVO.getReceiveAddress().getLatitude());
+            redisTemplate.delete(REDIS_WEATHER + cityCode);
         }
 
         return Result.ok();