From 153cc3fd4ef015a8b1390b2eef3d102c5859a5e7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 16:07:48 +0800
Subject: [PATCH] dnc Module error fix
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagServiceImpl.java | 328 ++++++++++++++----------------------------------------
1 files changed, 85 insertions(+), 243 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagServiceImpl.java
index 7e4996b..ddca1df 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/dnc/service/impl/DncArtBagServiceImpl.java
@@ -1,14 +1,5 @@
package com.qianwen.smartman.modules.dnc.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import java.lang.invoke.SerializedLambda;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
@@ -16,16 +7,28 @@
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.dnc.convert.DncArtBagConvert;
import com.qianwen.smartman.modules.dnc.entity.DncArtBag;
import com.qianwen.smartman.modules.dnc.entity.DncArtFile;
+import com.qianwen.smartman.modules.dnc.entity.DncArtProduct;
import com.qianwen.smartman.modules.dnc.entity.DncProcessCatalogue;
import com.qianwen.smartman.modules.dnc.enums.BagProcessEnum;
import com.qianwen.smartman.modules.dnc.mapper.DncArtBagMapper;
@@ -36,10 +39,6 @@
import com.qianwen.smartman.modules.dnc.vo.BagProcessQueryVO;
import com.qianwen.smartman.modules.dnc.vo.DncArtBagSaveVO;
import com.qianwen.smartman.modules.dnc.vo.DncArtBagVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/dnc/service/impl/DncArtBagServiceImpl.class */
@@ -51,195 +50,6 @@
private IDncArtFileService dncArtFileService;
@Autowired
private IDncArtProductService dncArtProductService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case -1646483922:
- if (implMethodName.equals("getCatalogueId")) {
- z = true;
- break;
- }
- break;
- case -75622813:
- if (implMethodName.equals("getCode")) {
- z = true;
- break;
- }
- break;
- case -75308287:
- if (implMethodName.equals("getName")) {
- z = true;
- break;
- }
- break;
- case 98245393:
- if (implMethodName.equals("getId")) {
- z = true;
- break;
- }
- break;
- case 124572976:
- if (implMethodName.equals("getAllPath")) {
- z = true;
- break;
- }
- break;
- case 812940310:
- if (implMethodName.equals("getArtBagId")) {
- z = true;
- break;
- }
- break;
- case 961079513:
- if (implMethodName.equals("getIsDeleted")) {
- z = false;
- break;
- }
- break;
- case 1343131517:
- if (implMethodName.equals("getFilename")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getIsDeleted();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCatalogueId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCatalogueId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCatalogueId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getCatalogueId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getArtBagId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtProduct") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getArtBagId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getName();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFilename();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtFile") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getFilename();
- };
- }
- break;
- case RegionCache.VILLAGE_LEVEL /* 5 */:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncProcessCatalogue") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getAllPath();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/dnc/entity/DncArtBag") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
@Override // org.springblade.modules.dnc.service.IDncArtBagService
public DncArtBagVO save(DncArtBagSaveVO dncArtBagSaveVO) {
@@ -260,6 +70,11 @@
@Override // org.springblade.modules.dnc.service.IDncArtBagService
public IPage<DncArtBagVO> page(IPage<DncArtBag> page, String catalogueId, String keyWord) {
+ IPage<DncArtBag> pages = page(page, Wrappers.<DncArtBag>lambdaQuery()
+ .eq(DncArtBag::getCatalogueId, catalogueId)
+ .and(Func.isNotEmpty(keyWord), wrapper -> wrapper.likeRight(DncArtBag::getCode, keyWord).or().likeRight(DncArtBag::getName, keyWord)));
+
+ /*
IPage<DncArtBag> pages = page(page, ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCatalogueId();
}, catalogueId)).and(Func.isNotEmpty(keyWord), wrapper -> {
@@ -269,6 +84,7 @@
return v0.getName();
}, keyWord);
}));
+ */
IPage<DncArtBagVO> dncArtBagVOIPage = DncArtBagConvert.INSTANCE.convert(pages);
dncArtBagVOIPage.getRecords().forEach(dncArtBagVO -> {
DncProcessCatalogue dncProcessCatalogue = (DncProcessCatalogue) this.dncProcessCatalogueService.getById(dncArtBagVO.getCatalogueId());
@@ -289,17 +105,30 @@
@Transactional(rollbackFor = {Exception.class})
public boolean remove(List<String> ids) {
removeByIds(Func.toLongList(ids));
+
+ this.dncArtFileService.remove(Wrappers.<DncArtFile>lambdaQuery().in(DncArtFile::getArtBagId, ids));
+ this.dncArtProductService.remove((Wrapper)Wrappers.<DncArtProduct>lambdaQuery().in(DncArtProduct::getArtBagId, ids));
+
+ /*
this.dncArtFileService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getArtBagId();
}, ids));
this.dncArtProductService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getArtBagId();
- }, ids));
+ }, ids));*/
return true;
}
@Override // org.springblade.modules.dnc.service.IDncArtBagService
public IPage<DncArtBagVO> curAndSubPage(Query query, String catalogueId) {
+ List<Long> cateIds = this.dncProcessCatalogueService.listObjs(Wrappers.<DncProcessCatalogue>lambdaQuery()
+ .select( DncProcessCatalogue::getId ).like(DncProcessCatalogue::getAllPath, catalogueId)
+ .eq(DncProcessCatalogue::getIsDeleted, 0), id -> Long.valueOf(Func.toLong(id.toString())));
+
+ IPage<DncArtBag> pages = page(Condition.getPage(query), Wrappers.<DncArtBag>lambdaQuery()
+ .in(DncArtBag::getCatalogueId, cateIds));
+
+ /*
List<Long> cateIds = this.dncProcessCatalogueService.listObjs((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().select(new SFunction[]{(v0) -> {
return v0.getId();
}}).like((v0) -> {
@@ -311,7 +140,7 @@
});
IPage<DncArtBag> pages = page(Condition.getPage(query), (Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getCatalogueId();
- }, cateIds));
+ }, cateIds));*/
return DncArtBagConvert.INSTANCE.convert(pages);
}
@@ -321,7 +150,7 @@
String keyword = vo.getKeyword();
Query query = vo.getQuery();
if (Func.isBlank(keyword)) {
- return new Page(query.getCurrent().intValue(), query.getSize().intValue());
+ return new Page<>(query.getCurrent().intValue(), query.getSize().intValue());
}
switch (type) {
case BAG_OR_PROCESS:
@@ -331,7 +160,7 @@
case ONLY_PROCESS:
return onlyProcessQuery(keyword, query);
default:
- return new Page(query.getCurrent().intValue(), query.getSize().intValue());
+ return new Page<>(query.getCurrent().intValue(), query.getSize().intValue());
}
}
@@ -352,7 +181,7 @@
String allPath = dncProcessCatalogue.getAllPath();
String[] split = Func.split(allPath, "/");
List<DncProcessCatalogue> catalogues = this.dncProcessCatalogueService.listByIds(Lists.newArrayList(split));
- Map<Long, DncProcessCatalogue> catalogueMap = (Map) catalogues.stream().collect(Collectors.toMap((v0) -> {
+ Map<Long, DncProcessCatalogue> catalogueMap = catalogues.stream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, v -> {
return v;
@@ -373,38 +202,46 @@
}
private IPage<DncArtBagVO> bagOrProcessQuery(String keyword, Query query) {
- List<DncArtFile> artFiles = this.dncArtFileService.list((Wrapper) Wrappers.lambdaQuery().like((v0) -> {
- return v0.getFilename();
- }, keyword));
+ List<DncArtFile> artFiles = this.dncArtFileService.list( Wrappers.<DncArtFile>lambdaQuery().like(DncArtFile::getFilename, keyword));
+ List<DncArtBag> list = list(Wrappers.<DncArtBag>lambdaQuery()
+ .like(DncArtBag::getCode, keyword)
+ .or()
+ .like(DncArtBag::getName, keyword));
+ /*
List<DncArtBag> list = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().like((v0) -> {
return v0.getCode();
}, keyword)).or()).like((v0) -> {
return v0.getName();
- }, keyword));
- List<Long> ids = (List) list.stream().map((v0) -> {
+ }, keyword));*/
+ List<Long> ids = list.stream().map((v0) -> {
return v0.getId();
}).collect(Collectors.toList());
- Collection<? extends Long> bagIds = (List) artFiles.stream().map((v0) -> {
+ Collection<? extends Long> bagIds = artFiles.stream().map((v0) -> {
return v0.getArtBagId();
}).collect(Collectors.toList());
Set<Long> allIds = Sets.newHashSet(ids);
allIds.addAll(bagIds);
if (Func.isEmpty(allIds)) {
- return new Page(query.getCurrent().intValue(), query.getSize().intValue());
+ return new Page<>(query.getCurrent().intValue(), query.getSize().intValue());
}
- IPage<DncArtBag> page = page(Condition.getPage(query), (Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getId();
- }, allIds));
- page.getRecords().sort(Comparator.comparing((v0) -> {
- return v0.getCreateTime();
- }).reversed());
+ IPage<DncArtBag> page = page(Condition.getPage(query), Wrappers.<DncArtBag>lambdaQuery().in(DncArtBag::getId, allIds));
+
+ page.getRecords().sort(Comparator.comparing(DncArtBag::getCreateTime).reversed());
+
List<DncArtBagVO> convert = DncArtBagConvert.INSTANCE.convert(page.getRecords());
- Page page2 = new Page(page.getCurrent(), page.getSize(), page.getTotal());
+ Page<DncArtBagVO> page2 = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
page2.setRecords(convert);
return page2;
}
private IPage<DncArtBagVO> onlyBagQuery(String keyword, Query query) {
+ IPage<DncArtBag> page = page(Condition.getPage(query), Wrappers.<DncArtBag>lambdaQuery()
+ .like(DncArtBag::getCode, keyword)
+ .or()
+ .like(DncArtBag::getName, keyword));
+ page.getRecords().sort(Comparator.comparing(DncArtBag::getCreateTime).reversed());
+
+ /*
IPage<DncArtBag> page = page(Condition.getPage(query), (Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().like((v0) -> {
return v0.getCode();
}, keyword)).or()).like((v0) -> {
@@ -413,52 +250,57 @@
page.getRecords().sort(Comparator.comparing((v0) -> {
return v0.getCreateTime();
}).reversed());
+ */
List<DncArtBagVO> convert = DncArtBagConvert.INSTANCE.convert(page.getRecords());
- Page page2 = new Page(page.getCurrent(), page.getSize(), page.getTotal());
+ Page<DncArtBagVO> page2 = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
page2.setRecords(convert);
return page2;
}
private IPage<DncArtBagVO> onlyProcessQuery(String keyword, Query query) {
+ List<DncArtFile> artFiles = this.dncArtFileService.list(Wrappers.<DncArtFile>lambdaQuery()
+ .like(DncArtFile::getFilename, keyword));
+ /*
List<DncArtFile> artFiles = this.dncArtFileService.list((Wrapper) Wrappers.lambdaQuery().like((v0) -> {
return v0.getFilename();
- }, keyword));
+ }, keyword));*/
if (Func.isEmpty(artFiles)) {
- return new Page(query.getCurrent().intValue(), query.getSize().intValue());
+ return new Page<>(query.getCurrent().intValue(), query.getSize().intValue());
}
- List<Long> bagIds = (List) artFiles.stream().map((v0) -> {
+ List<Long> bagIds = artFiles.stream().map((v0) -> {
return v0.getArtBagId();
}).collect(Collectors.toList());
+
+ IPage<DncArtBag> page = page(Condition.getPage(query), Wrappers.<DncArtBag>lambdaQuery().in(DncArtBag::getId, bagIds));
+ page.getRecords().sort(Comparator.comparing(DncArtBag::getCreateTime).reversed());
+ /*
IPage<DncArtBag> page = page(Condition.getPage(query), (Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getId();
}, bagIds));
page.getRecords().sort(Comparator.comparing((v0) -> {
return v0.getCreateTime();
- }).reversed());
+ }).reversed());*/
List<DncArtBagVO> convert = DncArtBagConvert.INSTANCE.convert(page.getRecords());
- Page page2 = new Page(page.getCurrent(), page.getSize(), page.getTotal());
+ Page<DncArtBagVO> page2 = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
page2.setRecords(convert);
return page2;
}
private void check(Long catalogueId, Long id, String code, String name) {
- long countCode = count(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCatalogueId();
- }, catalogueId)).eq((v0) -> {
- return v0.getCode();
- }, code)).ne(Func.isNotEmpty(id), (v0) -> {
- return v0.getId();
- }, id));
+ long countCode = count(Wrappers.<DncArtBag>lambdaQuery()
+ .eq(DncArtBag::getCatalogueId, catalogueId)
+ .eq(DncArtBag::getCode, code)
+ .ne(Func.isNotEmpty(id), DncArtBag::getId, id));
+
if (countCode > 0) {
throw new ServiceException(MessageUtils.message("dnc.art.bag.code.already.exists", new Object[0]));
}
- long countName = count(((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCatalogueId();
- }, catalogueId)).eq((v0) -> {
- return v0.getName();
- }, name)).ne(Func.isNotEmpty(id), (v0) -> {
- return v0.getId();
- }, id));
+
+ long countName = count(Wrappers.<DncArtBag>lambdaQuery()
+ .eq(DncArtBag::getCatalogueId, catalogueId)
+ .eq(DncArtBag::getName, name)
+ .ne(Func.isNotEmpty(id), DncArtBag::getId, id));
+
if (countName > 0) {
throw new ServiceException(MessageUtils.message("dnc.art.bag.name.already.exists", new Object[0]));
}
--
Gitblit v1.9.3