area

hx-area/src/main/java/com/fjhx/area/service/AreaInfoService.java

@@ -1,10 +1,8 @@
 package com.fjhx.area.service;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.area.entity.dto.AreaInfoSelectDto;
 import com.fjhx.area.entity.po.AreaInfo;
-import com.ruoyi.common.constant.DatasourceConstant;
 
 import java.util.List;
 
@@ -26,6 +24,6 @@ public interface AreaInfoService extends IService<AreaInfo> {
     /**
      * 赋值地区名称
      */
-    void setAreaName(List<ISetAreaName> setAreaNameList);
+    void setAreaName(List<? extends ISetAreaName> setAreaNameList);
 
 }

hx-area/src/main/java/com/fjhx/area/service/impl/AreaInfoServiceImpl.java

@@ -41,7 +41,7 @@ public class AreaInfoServiceImpl extends ServiceImpl<AreaInfoMapper, AreaInfo> i
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     @DS(DatasourceConstant.SLAVE_NAME)
     @Override
-    public void setAreaName(List<ISetAreaName> areaList) {
+    public void setAreaName(List<? extends ISetAreaName> areaList) {
         Set<String> areaIdList = new HashSet<>();
 
         for (ISetAreaName iSetAreaName : areaList) {
@@ -69,19 +69,19 @@ public class AreaInfoServiceImpl extends ServiceImpl<AreaInfoMapper, AreaInfo> i
             if (StrUtil.isNotBlank(iSetAreaName.getCountryId())) {
                 AreaInfo areaInfo = areaInfoMap.get(iSetAreaName.getCountryId());
                 if (areaInfo != null) {
-                    iSetAreaName.setCountryName(areaInfo.getChineseName());
+                    iSetAreaName.setCountryName(areaInfo.getName());
                 }
             }
             if (StrUtil.isNotBlank(iSetAreaName.getProvinceId())) {
                 AreaInfo areaInfo = areaInfoMap.get(iSetAreaName.getProvinceId());
                 if (areaInfo != null) {
-                    iSetAreaName.setProvinceName(areaInfo.getChineseName());
+                    iSetAreaName.setProvinceName(areaInfo.getName());
                 }
             }
             if (StrUtil.isNotBlank(iSetAreaName.getCityId())) {
                 AreaInfo areaInfo = areaInfoMap.get(iSetAreaName.getCityId());
                 if (areaInfo != null) {
-                    iSetAreaName.setCityName(areaInfo.getChineseName());
+                    iSetAreaName.setCityName(areaInfo.getName());
                 }
             }
 

hx-area/src/main/java/com/fjhx/area/utils/AreaUtil.java

@@ -4,6 +4,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.fjhx.area.service.AreaInfoService;
 import com.fjhx.area.service.ISetAreaName;
 
+import java.util.Collections;
 import java.util.List;
 
 public class AreaUtil {
@@ -13,8 +14,15 @@ public class AreaUtil {
     /**
      * 赋值地区名称
      */
-    public static void setAreaName(List<ISetAreaName> setAreaNameList) {
+    public static void setAreaName(List<? extends ISetAreaName> setAreaNameList) {
         fileInfoService.setAreaName(setAreaNameList);
     }
 
+    /**
+     * 赋值地区名称
+     */
+    public static void setAreaName(ISetAreaName setAreaName) {
+        fileInfoService.setAreaName(Collections.singletonList(setAreaName));
+    }
+
 }