diff --git a/nflg-mobilebroken-product/src/main/resources/bootstrap-dev.properties b/nflg-mobilebroken-product/src/main/resources/bootstrap-dev.properties index 3e8f7af9..2dd2c39e 100644 --- a/nflg-mobilebroken-product/src/main/resources/bootstrap-dev.properties +++ b/nflg-mobilebroken-product/src/main/resources/bootstrap-dev.properties @@ -1,5 +1,5 @@ # Nacos 地址 -nacos.server-addr=${NACOS_SERVER_ADDR:112.74.186.154:8848} +nacos.server-addr=${NACOS_SERVER_ADDR:192.168.0.194:8848} #nacos.server-addr=192.168.0.194:8848 #spring.cloud.nacos.discovery.username=nacos #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java index 6225efe6..37b9dd47 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelHotimageService.java @@ -39,5 +39,5 @@ public interface IProductModelHotimageService extends IService implements IProductModelHotimageService { + @Resource + private IProductPartInfoService productPartInfoService; + @Override public Integer add(ProductModelHotImageAddRequest request) { ProductModelHotimage info=new ProductModelHotimage() @@ -143,10 +154,32 @@ public class ProductModelHotimageServiceImpl extends ServiceImpl jsonObjects = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(jsonArray)) { + List ids = new ArrayList<>(); + jsonArray.forEach(item -> { + JSONObject jsonObject = JSONUtil.parseObj(item); + ids.add(jsonObject.getInt("id")); + }); + List partInfos = productPartInfoService.lambdaQuery().eq(ProductPartInfo::getLanguageCode, language).in(ProductPartInfo::getPartId, ids).list(); + jsonArray.forEach(obj -> { + JSONObject jsonObject = (JSONObject) obj; + ProductPartInfo pi = partInfos.stream().filter(partInfo -> Objects.equals(partInfo.getPartId(), jsonObject.getInt("id"))).findFirst().orElse(null); + if (Objects.nonNull(pi) && StrUtil.isNotBlank(pi.getName()) && Objects.equals(jsonObject.getInt("id"), pi.getPartId())) { + jsonObject.set("name", pi.getName()); + } + jsonObjects.add(jsonObject); + }); + } + return new ProductHotImageInfoVO() + .setImage(info.getImage()) + .setImgRect(info.getImgRect()) + .setData(JSONUtil.toJsonStr(jsonObjects)); } -} +} \ No newline at end of file diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java index b147e62d..b9793b2e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelServiceImpl.java @@ -298,7 +298,7 @@ public class ProductModelServiceImpl extends ServiceImpl