rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(repository): 完善删除功能

This commit is contained in:
曹鹏飞 2026-04-01 17:09:26 +08:00
parent 41100bdcf5
commit b3c625ce72
12 changed files with 132 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nflg-mobilebroken-admin/src/test/java/TTest.java
View File

@ -1,4 +1,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -7,9 +10,9 @@ import java.time.temporal.ChronoUnit;
public class TTest {
@Test
public void test1(){
LocalDate t1=LocalDateTime.now().toLocalDate();
LocalDate t2=LocalDateTime.now().toLocalDate().minusDays(1);
public void test1() {
LocalDate t1 = LocalDateTime.now().toLocalDate();
LocalDate t2 = LocalDateTime.now().toLocalDate().minusDays(1);
System.out.println(t1);
System.out.println(t2);
System.out.println(ChronoUnit.DAYS.between(null, t1));
@ -19,4 +22,12 @@ public class TTest {
public void test2() {
System.out.println("【" + " 打 撒sfc dffd发多少分多少 分多少分的d f ".replaceAll("\\s+", "") + "】");
}
@Test
public void test4() {
PasswordEncoder PASSWORDENCODER = new BCryptPasswordEncoder();
String password = PASSWORDENCODER.encode("Nflg0331");
System.out.println(password);
Assertions.assertTrue(PASSWORDENCODER.matches("Nflg0331", password), "密码不正确");
}
}

3
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelImageItemService.java
View File

@ -4,6 +4,7 @@ import com.nflg.mobilebroken.common.pojo.request.ProductModelImageItemAddRequest
import com.nflg.mobilebroken.repository.entity.ProductModelImageItem;
import com.baomidou.mybatisplus.extension.service.IService;
import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
@ -21,4 +22,6 @@ public interface IProductModelImageItemService extends IService<ProductModelImag
void update(List<ProductModelImageItemAddRequest> items);
List<ProductModelImageItemAddRequest> getInfo(Integer modelImagesId);
void removeByImageIds(List<Integer> ids);
}

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelIntroItemService.java
View File

@ -17,7 +17,9 @@ import java.util.List;
*/
public interface IProductModelIntroItemService extends IService<ProductModelIntroItem> {
void add(Integer id, @NotEmpty List<ProductModelIntroItemAddRequest> items);
void add(Integer id, List<ProductModelIntroItemAddRequest> items);
void update(List<ProductModelIntroItemAddRequest> items);
void deleteByIntroIds(List<Integer> ids);
}

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IProductModelVideoItemService.java
View File

@ -21,4 +21,6 @@ public interface IProductModelVideoItemService extends IService<ProductModelVide
void update(List<ProductModelVideoItemAddRequest> items);
List<ProductModelVideoItemAddRequest> getInfo(Integer modelVideoId);
void removeByVideoIds(List<Integer> itemIds);
}

39
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelFileServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -18,6 +19,7 @@ import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.Language;
import com.nflg.mobilebroken.repository.entity.ProductModelFile;
import com.nflg.mobilebroken.repository.entity.ProductModelFileItem;
import com.nflg.mobilebroken.repository.entity.ProductModelIntro;
import com.nflg.mobilebroken.repository.mapper.ProductModelFileMapper;
import com.nflg.mobilebroken.repository.service.ILanguageService;
import com.nflg.mobilebroken.repository.service.IProductModelFileItemService;
@ -59,11 +61,11 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
.setUrl(request.getUrl())
.setType(request.getType())
.setSize(request.getSize())
.setSort(RandomUtil.randomInt(0,10000))
.setSort(RandomUtil.randomInt(0, 10000))
.setCreateBy(AdminUserUtil.getUserName())
.setCreateTime(LocalDateTime.now());
save(info);
productModelFileItemService.add(request.getModelId(),info.getId(), request.getItems());
productModelFileItemService.add(request.getModelId(), info.getId(), request.getItems());
return info.getId();
}
@ -76,7 +78,7 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
// info.setUpdateTime(LocalDateTime.now());
// updateById(info);
// productModelFileItemService.update(info.getId(),request.getItems());
ProductModelFile info=getById(request.getId());
ProductModelFile info = getById(request.getId());
if (Objects.equals(info.getState(), PublishState.Published.getState())) {
request.setBatchNumber(info.getBatchNumber());
return add(request);
@ -90,24 +92,24 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
info.setUpdateBy(AdminUserUtil.getUserName());
info.setUpdateTime(LocalDateTime.now());
updateById(info);
productModelFileItemService.update(request.getId(),request.getItems());
productModelFileItemService.update(request.getId(), request.getItems());
return info.getId();
}
}
@Override
public void enable(EnableRequest request) {
ProductModelFile info=getById(request.getId());
ProductModelFile info = getById(request.getId());
VUtils.trueThrowBusinessError(Objects.isNull(info)).throwMessage("无效的数据");
if (request.getEnable()){
if (request.getEnable()) {
//启用
info.setEnable(true);
info.setUpdateBy(AdminUserUtil.getUserName());
info.setUpdateTime(LocalDateTime.now());
updateById(info);
}else {
} else {
//禁用
VUtils.trueThrowBusinessError(Objects.equals(info.getState(),PublishState.Published.getState()))
VUtils.trueThrowBusinessError(Objects.equals(info.getState(), PublishState.Published.getState()))
.throwMessage("不能禁用已发布的数据");
info.setEnable(false);
info.setUpdateBy(AdminUserUtil.getUserName());
@ -187,12 +189,23 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
@Override
public ProductFileVO getDefaultByLanguage(Integer modelId, String language) {
return baseMapper.getDefaultByLanguage(modelId,language);
return baseMapper.getDefaultByLanguage(modelId, language);
}
@Transactional
@Override
public void deleteByModel(List<Integer> ids) {
remove(new LambdaQueryWrapper<ProductModelFile>().in(ProductModelFile::getModelId, ids));
List<Integer> itemIds = lambdaQuery()
.eq(ProductModelFile::getModelId, ids)
.select(ProductModelFile::getId)
.list()
.stream()
.map(ProductModelFile::getId)
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(itemIds)) {
productModelFileItemService.removeByFileIds(itemIds);
}
removeByIds(itemIds);
}
@Override
@ -229,7 +242,7 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
@Override
public void copyItems(Integer oldId, Integer newId) {
baseMapper.copyItems(oldId,newId);
baseMapper.copyItems(oldId, newId);
}
@Override
@ -241,7 +254,7 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
@Override
public List<FileDefaultConfigVO> getDefaultConfig(Integer modelId) {
List<FileDefaultConfigVO> vos=new ArrayList<>();
List<FileDefaultConfigVO> vos = new ArrayList<>();
List<Language> languages = languageService.getLanguages();
List<ProductModelFileItem> list = productModelFileItemService.getPublishedByLanguage(modelId);
languages.forEach(language -> {
@ -267,6 +280,6 @@ public class ProductModelFileServiceImpl extends ServiceImpl<ProductModelFileMap
@Override
public List<ProductFileVO> getListByLanguage(Integer modelId, String language) {
return baseMapper.getListByLanguage(modelId,language);
return baseMapper.getListByLanguage(modelId, language);
}
}

7
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageItemServiceImpl.java
View File

@ -69,4 +69,11 @@ public class ProductModelImageItemServiceImpl extends ServiceImpl<ProductModelIm
)
.collect(Collectors.toList());
}
@Override
public void removeByImageIds(List<Integer> ids) {
lambdaUpdate()
.in(ProductModelImageItem::getModelImagesId, ids)
.remove();
}
}

16
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelImageServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.nflg.mobilebroken.common.pojo.vo.ProductImageVO;
import com.nflg.mobilebroken.common.pojo.vo.ProductModelImagesInfoVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.ProductModelFile;
import com.nflg.mobilebroken.repository.entity.ProductModelImage;
import com.nflg.mobilebroken.repository.mapper.ProductModelImageMapper;
import com.nflg.mobilebroken.repository.service.IProductModelImageItemService;
@ -76,6 +77,7 @@ public class ProductModelImageServiceImpl extends ServiceImpl<ProductModelImageM
}
}
@Transactional
@Override
public void delete(BatchDeleteRequest request) {
VUtils.trueThrowBusinessError(lambdaQuery()
@ -88,6 +90,7 @@ public class ProductModelImageServiceImpl extends ServiceImpl<ProductModelImageM
.ne(ProductModelImage::getCreateBy, AdminUserUtil.getUserName())
.exists()).throwMessage("不能删除其他人创建的数据");
removeByIds(request.getIds());
productModelImageItemService.removeByImageIds(request.getIds());
}
@Override
@ -183,9 +186,20 @@ public class ProductModelImageServiceImpl extends ServiceImpl<ProductModelImageM
return baseMapper.getListByLanguage(modelId,language);
}
@Transactional
@Override
public void deleteByModel(List<Integer> ids) {
remove(new LambdaQueryWrapper<ProductModelImage>().in(ProductModelImage::getModelId, ids));
List<Integer> itemIds = lambdaQuery()
.eq(ProductModelImage::getModelId, ids)
.select(ProductModelImage::getId)
.list()
.stream()
.map(ProductModelImage::getId)
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(itemIds)) {
productModelImageItemService.removeByImageIds(itemIds);
}
removeByIds(itemIds);
}
@Override

7
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelIntroItemServiceImpl.java
View File

@ -52,4 +52,11 @@ public class ProductModelIntroItemServiceImpl extends ServiceImpl<ProductModelIn
.collect(Collectors.toList())
);
}
@Override
public void deleteByIntroIds(List<Integer> ids) {
lambdaUpdate()
.in(ProductModelIntroItem::getModelIntroId, ids)
.remove();
}
}

24
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelIntroServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -10,6 +11,7 @@ import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.ProductModelIntro;
import com.nflg.mobilebroken.repository.entity.ProductModelIntroItem;
import com.nflg.mobilebroken.repository.entity.ProductModelParams;
import com.nflg.mobilebroken.repository.mapper.ProductModelIntroMapper;
import com.nflg.mobilebroken.repository.service.IProductModelIntroItemService;
import com.nflg.mobilebroken.repository.service.IProductModelIntroService;
@ -20,6 +22,7 @@ import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* <p>
@ -63,6 +66,7 @@ public class ProductModelIntroServiceImpl extends ServiceImpl<ProductModelIntroM
}
}
@Transactional
@Override
public void delete(BatchDeleteRequest request) {
VUtils.trueThrowBusinessError(lambdaQuery()
@ -75,6 +79,7 @@ public class ProductModelIntroServiceImpl extends ServiceImpl<ProductModelIntroM
.ne(ProductModelIntro::getCreateBy, AdminUserUtil.getUserName())
.exists()).throwMessage("不能删除其他人创建的数据");
removeByIds(request.getIds());
productModelIntroItemService.deleteByIntroIds(request.getIds());
}
@Override
@ -123,22 +128,33 @@ public class ProductModelIntroServiceImpl extends ServiceImpl<ProductModelIntroM
@Override
public List<ProductModelIntroItem> getInfo(Integer introId) {
return productModelIntroItemService.lambdaQuery()
.eq(ProductModelIntroItem::getModelIntroId,introId)
.eq(ProductModelIntroItem::getModelIntroId, introId)
.list();
}
@Override
public void copyItems(Integer oldId, Integer newId) {
baseMapper.copyItems(oldId,newId);
baseMapper.copyItems(oldId, newId);
}
@Transactional
@Override
public void deleteByModel(List<Integer> ids) {
remove(new LambdaQueryWrapper<ProductModelIntro>().in(ProductModelIntro::getModelId, ids));
List<Integer> itemIds = lambdaQuery()
.eq(ProductModelIntro::getModelId, ids)
.select(ProductModelIntro::getId)
.list()
.stream()
.map(ProductModelIntro::getId)
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(itemIds)) {
productModelIntroItemService.deleteByIntroIds(itemIds);
}
removeByIds(itemIds);
}
@Override
public ProductModelIntroItem getByLanguage(Integer modelId, String language) {
return baseMapper.getByLanguage(modelId,language);
return baseMapper.getByLanguage(modelId, language);
}
}

13
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelParamsServiceImpl.java
View File

@ -144,9 +144,20 @@ public class ProductModelParamsServiceImpl extends ServiceImpl<ProductModelParam
return baseMapper.getAllListByLanguage(modelId, language);
}
@Transactional
@Override
public void deleteByModel(List<Integer> ids) {
remove(new LambdaQueryWrapper<ProductModelParams>().in(ProductModelParams::getModelId, ids));
List<Integer> itemIds=lambdaQuery()
.eq(ProductModelParams::getModelId, ids)
.select(ProductModelParams::getId)
.list()
.stream()
.map(ProductModelParams::getId)
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(itemIds)){
productModelParamsItemService.deleteByParamsIds(itemIds);
}
removeByIds(itemIds);
}
@Override

7
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoItemServiceImpl.java
View File

@ -75,4 +75,11 @@ public class ProductModelVideoItemServiceImpl extends ServiceImpl<ProductModelVi
)
.collect(Collectors.toList());
}
@Override
public void removeByVideoIds(List<Integer> itemIds) {
lambdaUpdate()
.in(ProductModelVideoItem::getModelVideoId, itemIds)
.remove();
}
}

16
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/ProductModelVideoServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.nflg.mobilebroken.common.pojo.vo.ProductModelVideoInfoVO;
import com.nflg.mobilebroken.common.pojo.vo.ProductVideoVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.ProductModelImage;
import com.nflg.mobilebroken.repository.entity.ProductModelVideo;
import com.nflg.mobilebroken.repository.mapper.ProductModelVideoMapper;
import com.nflg.mobilebroken.repository.service.IProductModelVideoItemService;
@ -97,6 +98,7 @@ public class ProductModelVideoServiceImpl extends ServiceImpl<ProductModelVideoM
}
}
@Transactional
@Override
public void delete(BatchDeleteRequest request) {
VUtils.trueThrowBusinessError(lambdaQuery()
@ -109,6 +111,7 @@ public class ProductModelVideoServiceImpl extends ServiceImpl<ProductModelVideoM
.ne(ProductModelVideo::getCreateBy, AdminUserUtil.getUserName())
.exists()).throwMessage("不能删除其他人创建的数据");
removeByIds(request.getIds());
productModelVideoItemService.removeByVideoIds(request.getIds());
}
@Override
@ -183,9 +186,20 @@ public class ProductModelVideoServiceImpl extends ServiceImpl<ProductModelVideoM
return baseMapper.getListByLanguage(modelId,language);
}
@Transactional
@Override
public void deleteByModel(List<Integer> ids) {
remove(new LambdaQueryWrapper<ProductModelVideo>().in(ProductModelVideo::getModelId, ids));
List<Integer> itemIds = lambdaQuery()
.eq(ProductModelVideo::getModelId, ids)
.select(ProductModelVideo::getId)
.list()
.stream()
.map(ProductModelVideo::getId)
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(itemIds)) {
productModelVideoItemService.removeByVideoIds(itemIds);
}
removeByIds(itemIds);
}
@Override