From a1d3c745539f8c717563f405430cf7cb028d25e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 10 Sep 2025 09:51:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-564=20=E4=BA=A7=E5=93=81=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=EF=BC=8C=E7=AE=A1=E7=90=86=E7=AB=AF=EF=BC=8C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E8=B5=84=E6=96=99=E7=AE=A1=E7=90=86=E8=BF=99=E9=87=8C?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E9=94=99=E4=BA=86=EF=BC=8C=E6=83=B3?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8F=96=E6=B6=88=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/entity/ProductModelFileItem.java | 2 +- .../service/IProductModelFileItemService.java | 3 +++ .../impl/ProductModelFileItemServiceImpl.java | 7 +++++++ .../service/impl/ProductModelFileServiceImpl.java | 14 ++++++++------ .../mapper/ProductModelFileItemMapper.xml | 2 +- .../resources/mapper/ProductModelFileMapper.xml | 2 +- 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelFileItem.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelFileItem.java index 75a872dc..f518f08c 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelFileItem.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/ProductModelFileItem.java @@ -32,7 +32,7 @@ public class ProductModelFileItem implements Serializable { private Integer modelId; /** - * 产品机型id + * 产品机型文件id */ private Integer modelFileId; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileItemService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileItemService.java index eb169c44..8e84c169 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileItemService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelFileItemService.java @@ -5,6 +5,7 @@ import com.nflg.mobilebroken.common.pojo.request.FileDefaultConfigRequest; import com.nflg.mobilebroken.common.pojo.request.ProductModelFileItemAddRequest; import com.nflg.mobilebroken.repository.entity.ProductModelFileItem; +import javax.validation.constraints.NotEmpty; import java.util.List; /** @@ -24,4 +25,6 @@ public interface IProductModelFileItemService extends IService getPublishedByLanguage(Integer modelId); + + void removeByFileIds(@NotEmpty List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileItemServiceImpl.java index 117bc9a1..5cf23c64 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileItemServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileItemServiceImpl.java @@ -88,4 +88,11 @@ public class ProductModelFileItemServiceImpl extends ServiceImpl getPublishedByLanguage(Integer modelId) { return baseMapper.getPublishedByLanguage(modelId); } + + @Override + public void removeByFileIds(List ids) { + remove(new LambdaQueryWrapper() + .in(ProductModelFileItem::getModelFileId, ids) + ); + } } \ No newline at end of file diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java index 4209be3f..1ddd02d7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java @@ -116,6 +116,7 @@ public class ProductModelFileServiceImpl extends ServiceImpl StrUtil.equals(language.getCode(), item.getLanguageCode())) - .map(item -> { - return new FileDefaultConfigItemVO() - .setId(item.getId()) - .setName(item.getName()) - .setSelected(item.getShowInList()); - }).collect(Collectors.toList())); + .map(item -> new FileDefaultConfigItemVO() + .setId(item.getId()) + .setName(item.getName()) + .setSelected(item.getShowInList()) + ).collect(Collectors.toList()) + ); vos.add(vo); }); return vos; diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileItemMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileItemMapper.xml index 4e1738f5..20a949ee 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileItemMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileItemMapper.xml @@ -7,6 +7,6 @@ from product_model_file pmf inner join product_model_file_item pmfi on pmfi.model_file_id=pmf.id where pmf.state=1 and pmf.enable=1 and pmf.model_id=#{modelId} - order by pmfi.language_code,pmfi.show_in_list desc + order by pmfi.language_code,pmfi.show_in_list desc,pmfi.id desc diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml index 4dfe1a86..4a80e666 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelFileMapper.xml @@ -2,7 +2,7 @@