diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java index 9202ecf790508ce322958e59e43d1c28cf64ee0b..e37c5129ea228c480bdd5ca200a7930e08ce7a75 100644 --- a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java @@ -1,5 +1,7 @@ package com.mortals.xhx.module.site.service.impl; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import com.mortals.framework.ap.GlobalSysInfo; import com.mortals.framework.exception.AppException; @@ -303,9 +305,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE siteEntity.setLogoFullPath(fullPath); } - if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getModelIds())) { - List<ModelEntity> collect = Arrays.asList(siteEntity.getModelIds().split(",")).stream().map(modelId -> modelService.get(Long.parseLong(modelId))).collect(Collectors.toList()); - siteEntity.setModelList(collect); - } +// if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getModelIds())) { +// List<Long> modelIdlist = StrUtil.split(siteEntity.getModelIds(), ",".charAt(0), -1, true, (String str) -> Long.parseLong(str)); +// List<ModelEntity> collect =modelService.find(new ModelQuery().idList(modelIdlist)); +// siteEntity.setModelList(collect); +// } } } \ No newline at end of file diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java index ff0e0a1007981ea12e92b0cd082d91868001ad8c..75fe56403ae3d6f0769526c556816a26aaaf3dbb 100644 --- a/common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java +++ b/common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; * @author: zxfei * @date: 2022/5/30 10:40 */ -@FeignClient(name = "base-manager", path = "/base", fallback = AreaFeignFallbackFactory.class) +@FeignClient(name = "base-manager", path = "/base", fallbackFactory = AreaFeignFallbackFactory.class) public interface IApiAreaFeign extends IFeign { diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/model/IApiModelFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/model/IApiModelFeign.java index 8d219135108d20af36a10cacf0b9bc2952e71110..9605aa4b470a3828bc304a907964eddfef927d73 100644 --- a/common-lib/src/main/java/com/mortals/xhx/feign/model/IApiModelFeign.java +++ b/common-lib/src/main/java/com/mortals/xhx/feign/model/IApiModelFeign.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; -@FeignClient(name = "base-manager", path = "/base", fallback = ModelFeignFallbackFactory.class) +@FeignClient(name = "base-manager", path = "/base", fallbackFactory = ModelFeignFallbackFactory.class) public interface IApiModelFeign extends IFeign { /** diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java index 7bab0ef77690db65baf85f7e7884ea6dd76723f3..2926a2b151346602aefc42d081a9e3bcc365f4e0 100644 --- a/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java +++ b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; * @author zxfei * @date 2022-07-06 */ -@FeignClient(name = "portal-manager", path = "/zwfw", fallback = UserFeignFallbackFactory.class) +@FeignClient(name = "portal-manager", path = "/zwfw", fallbackFactory = UserFeignFallbackFactory.class) public interface IUserFeign extends IFeign {