From 5d7f860e8d6d8bbf78e0d24f56053de8d1943522 Mon Sep 17 00:00:00 2001
From: "t-shunyi.kuang" <846002312@qq.com>
Date: Fri, 7 Nov 2025 11:45:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CountryRegionController.java    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
index ff68834..7192812 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
@@ -35,6 +35,8 @@ import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.CacheUtil;
+import com.xjrsoft.common.utils.RedisUtil;
+import com.xjrsoft.common.utils.TenantUtil;
 import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.common.db.utils.CommonCallUtils;
@@ -74,6 +76,7 @@ public class CountryRegionController {
 
     private final ICountryRegionService countryRegionService;
 	private final DatalogService dataService;
+	private final RedisUtil redisUtil;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="LngBRegion列表(分页)")
@@ -286,9 +289,20 @@ public class CountryRegionController {
     
     private void refreshCahe(){
     	    //异步更新
-    	
         CompletableFuture.runAsync(() -> {
-          	CacheUtil.refreshRegionList();
+	        	try {
+    	            TenantUtil.ignore(true);
+    	            Log.info("MDM: 加载所有国家地区表缓存开始");
+    		        List<LngBRegion> list = countryRegionService.list();
+    		        redisUtil.set(GlobalConstant.REGION_CACHE_KEY, list);
+    		        redisUtil.set(GlobalConstant.REGION_NAME_CACHE_KEY, list.stream().collect(Collectors.toMap(LngBRegion::getCode,LngBRegion::getFullPath)));
+	    		    Log.info("MDM: 加载所有国家地区表缓存结束");
+	        	}catch (Exception e) {
+				Log.info(e.getLocalizedMessage(), e);
+			}finally {
+	             TenantUtil.clear();
+	        }
+          	
         });
     }
 }
\ No newline at end of file

From 7d706338c006740c71f0f52d6e7fd7231716967b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A7=89=E5=8D=93?= <v-zhangbingzhuo@sinochem.com>
Date: Fri, 7 Nov 2025 14:09:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=92=8C=E5=9C=B0=E5=8C=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java | 10 ++++------
 .../java/com/xjrsoft/module/mdm/vo/LngBPortVo.java     |  1 -
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java
index 859552a..ea9dcae 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortPageVo.java
@@ -1,13 +1,10 @@
 package com.xjrsoft.module.mdm.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
 import com.xjrsoft.common.annotation.Trans;
 import com.xjrsoft.common.enums.TransType;
-import java.time.LocalTime;
-import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.math.BigDecimal;
 
 /**
@@ -43,6 +40,7 @@ public class LngBPortPageVo {
     * 所属国家和地区
     */
     @ApiModelProperty("所属国家和地区")
+    @Trans(type = TransType.REGION)
     private String regionCode;
     /**
     * 吞吐量
diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortVo.java
index 4c9ce41..0885e0c 100644
--- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortVo.java
+++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBPortVo.java
@@ -49,7 +49,6 @@ public class LngBPortVo {
     * 所属国家和地区
     */
     @ApiModelProperty("所属国家和地区")
-    @Trans(type = TransType.REGION)
     private String regionCode;