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; 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 7a0c2f7..21ffcc4 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 @@ -31,6 +31,8 @@ import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; +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; @@ -70,8 +72,7 @@ public class CountryRegionController { private final DatalogService dataService; - @Autowired - private RegionDataProvider tranProvider; + private final RegionDataProvider tranProvider; @GetMapping(value = "/page") @ApiOperation(value="LngBRegion列表(分页)")