From 040976de6f9934b99f30268a28e2ecf42260e217 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 18 五月 2024 22:13:01 +0800
Subject: [PATCH] 注释整理
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java | 257 +++++++++++++-------------------------------------
1 files changed, 68 insertions(+), 189 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java
index d3a03a7..3ef7320 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java
@@ -1,14 +1,5 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -16,17 +7,18 @@
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+
import javax.validation.Valid;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonGroupConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.constant.ToolingConstant;
-import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
-import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.smartman.common.utils.TreeUtils;
-import com.qianwen.smartman.common.utils.ValidatorUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
@@ -35,11 +27,19 @@
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonGroupConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.constant.ToolingConstant;
+import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
+import com.qianwen.smartman.common.utils.MessageUtils;
+import com.qianwen.smartman.common.utils.TreeUtils;
+import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.modules.cps.convert.FixtureConvert;
import com.qianwen.smartman.modules.cps.convert.ToolAppendixConvert;
import com.qianwen.smartman.modules.cps.entity.CommonGroup;
import com.qianwen.smartman.modules.cps.entity.CommonGroupOfItem;
import com.qianwen.smartman.modules.cps.entity.Fixture;
+import com.qianwen.smartman.modules.cps.entity.ProductionCraftProcessRelatedFixture;
import com.qianwen.smartman.modules.cps.entity.ToolAppendix;
import com.qianwen.smartman.modules.cps.entity.TrayFixture;
import com.qianwen.smartman.modules.cps.enums.CommonGroupEnum;
@@ -62,12 +62,13 @@
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
import com.qianwen.smartman.modules.tpm.enums.MetaTypeEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * 澶瑰叿鏈嶅姟
+ */
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/FixtureServiceImpl.class */
public class FixtureServiceImpl extends BaseServiceImpl<FixtureMapper, Fixture> implements IFixtureService {
private static final Logger log = LoggerFactory.getLogger(FixtureServiceImpl.class);
private final ICommonGroupOfItemService commonGroupOfItemService;
@@ -77,127 +78,6 @@
private final OssBuilder ossBuilder;
private final ICodeGeneratorService codeGeneratorService;
private final IProductionCraftProcessRelatedFixtureService relatedFixtureService;
-
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- 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 517353092:
- if (implMethodName.equals("getItemId")) {
- z = false;
- break;
- }
- break;
- case 1183913550:
- if (implMethodName.equals("getFixtureId")) {
- z = true;
- break;
- }
- break;
- case 1330288580:
- if (implMethodName.equals("getGroupId")) {
- z = true;
- break;
- }
- break;
- case 1953270362:
- if (implMethodName.equals("getFixId")) {
- 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/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getItemId();
- };
- }
- 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/cps/entity/Fixture") && 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/cps/entity/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixId();
- };
- }
- 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/cps/entity/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixId();
- };
- }
- 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/cps/entity/TrayFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixId();
- };
- }
- 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/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/modules/cps/entity/CommonGroup") && 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/cps/entity/Fixture") && 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/cps/entity/Fixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getCode();
- };
- }
- 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/modules/cps/entity/CommonGroupOfItem") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getGroupId();
- };
- }
- 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/cps/entity/ProductionCraftProcessRelatedFixture") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getFixtureId();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public FixtureServiceImpl(final ICommonGroupOfItemService commonGroupOfItemService, final IToolAppendixService toolAppendixService, final ICommonGroupService commonGroupService, final ITrayFixtureService trayFixtureService, final OssBuilder ossBuilder, final ICodeGeneratorService codeGeneratorService, final IProductionCraftProcessRelatedFixtureService relatedFixtureService) {
this.commonGroupOfItemService = commonGroupOfItemService;
@@ -209,22 +89,23 @@
this.relatedFixtureService = relatedFixtureService;
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public Boolean removeFixture(List<Long> ids) {
if (ids.isEmpty()) {
return false;
}
+ long countRelatedFixture = this.relatedFixtureService.count(Wrappers.<ProductionCraftProcessRelatedFixture>lambdaQuery()
+ .in(ProductionCraftProcessRelatedFixture::getFixtureId, ids));
+ /*
long countRelatedFixture = this.relatedFixtureService.count((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
return v0.getFixtureId();
- }, ids));
+ }, ids));*/
ThrowFun.isTrue(countRelatedFixture > 0).throwMessage(MessageUtils.message("cps.system.banding.not.remove", new Object[0]));
- this.trayFixtureService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getFixId();
- }, ids));
+ this.trayFixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().in(TrayFixture::getFixId, ids));
return Boolean.valueOf(removeByIds(ids));
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public FixtureVO insert(@Valid FixtureVO fixtureVO, Long groupId) {
Fixture fixture = FixtureConvert.INSTANCE.convert(fixtureVO);
@@ -258,36 +139,38 @@
return convert;
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public void checkFixture(Fixture fixture) {
+ long count = count(Wrappers.<Fixture>lambdaQuery().eq(Fixture::getCode, fixture.getCode())
+ .ne(Func.isNotEmpty(fixture.getId()), Fixture::getId, fixture.getId()));
+ /*
long count = count(((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getCode();
}, fixture.getCode())).ne(Func.isNotEmpty(fixture.getId()), (v0) -> {
return v0.getId();
- }, fixture.getId()));
+ }, fixture.getId()));*/
if (count > 0) {
throw new ServiceException(MessageUtils.message("cps.fixture.code.already.exists", new Object[0]));
}
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public boolean remove(List<Long> ids) {
removeByIds(ids);
- this.trayFixtureService.remove((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getFixId();
- }, ids));
+ this.trayFixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().in(TrayFixture::getFixId, ids));
+
return true;
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public ToolAppendixVO insertFile(ToolAppendixVO toolAppendixVO) {
ToolAppendix toolAppendix = ToolAppendixConvert.INSTANCE.convert(toolAppendixVO);
this.toolAppendixService.save(toolAppendix);
return ToolAppendixConvert.INSTANCE.convert(toolAppendix);
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public List<FixtureGroupFixtureVO> fixtureGroupAndFixtureList() {
List<FixtureGroupFixtureVO> fixtureGroupFixtureVOList = ((FixtureMapper) this.baseMapper).listNotInUse();
fixtureGroupFixtureVOList.forEach(f -> {
@@ -297,13 +180,12 @@
if (Func.isEmpty(fixtureGroupFixtureVOList)) {
return Lists.newArrayList();
}
- List<Long> groupIdList = (List) fixtureGroupFixtureVOList.stream().map((v0) -> {
+ List<Long> groupIdList = fixtureGroupFixtureVOList.stream().map((v0) -> {
return v0.getParentId();
}).collect(Collectors.toList());
- List<CommonGroup> commonGroupList = this.commonGroupService.list((Wrapper) Wrappers.lambdaQuery().in((v0) -> {
- return v0.getId();
- }, groupIdList));
- List<FixtureGroupFixtureVO> groupList = (List) commonGroupList.stream().map(c -> {
+
+ List<CommonGroup> commonGroupList = this.commonGroupService.list(Wrappers.<CommonGroup>lambdaQuery().in(CommonGroup::getId, groupIdList));
+ List<FixtureGroupFixtureVO> groupList = commonGroupList.stream().map(c -> {
FixtureGroupFixtureVO fixtureGroupFixtureVO = new FixtureGroupFixtureVO();
fixtureGroupFixtureVO.setId(c.getId());
fixtureGroupFixtureVO.setName(c.getName());
@@ -317,7 +199,7 @@
return ForestNodeMerger.merge(fixtureGroupFixtureVOList);
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public BladeFile importFixture(MultipartFile file) {
if (Objects.isNull(file)) {
@@ -330,31 +212,22 @@
if (fixtureData.size() > 200) {
throw new ServiceException(MessageUtils.message("excel.import.size.failed", new Object[0]));
}
- Map<String, List<FixtureImport>> map = (Map) fixtureData.stream().filter(c -> {
- return Func.isNotEmpty(c.getFixtureCode());
- }).collect(Collectors.groupingBy((v0) -> {
- return v0.getFixtureCode();
- }));
+
+ Map<String, List<FixtureImport>> map = fixtureData.stream().filter(c -> Func.isNotEmpty(c.getFixtureCode())).collect(Collectors.groupingBy(FixtureImport::getFixtureCode));
+
HashMap<String, Long> commonGroupNameMap = this.commonGroupService.getCommonGroupNameMap(CommonGroupTypeEnum.FIXTURE.getName(), CommonGroupConstant.DEFAULT_CATEGORY);
- Set<String> fixtureCodeSet = (Set) list().stream().map((v0) -> {
- return v0.getCode();
- }).collect(Collectors.toSet());
+ Set<String> fixtureCodeSet = list().stream().map(Fixture::getCode).collect(Collectors.toSet());
+
checkFixtureImport(fixtureData, commonGroupNameMap, map, fixtureCodeSet);
- List<FixtureImport> fails = (List) fixtureData.stream().filter(w -> {
- return StrUtil.isNotEmpty(w.getFailReason());
- }).collect(Collectors.toList());
+
+ List<FixtureImport> fails = fixtureData.stream().filter(w -> StrUtil.isNotEmpty(w.getFailReason())).collect(Collectors.toList());
if (fails.size() > 0) {
- MultipartFile template = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "fixtureImportErrorTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "澶瑰叿淇℃伅琛�", (List) fixtureData.stream().filter(x -> {
- return Func.isNotEmpty(x.getFailReason());
- }).collect(Collectors.toList()), (Object) null, (AbstractMergeStrategy) null);
+ MultipartFile template = ExcelUtil.exportFillTemplateToMultipartFile(ExcelConstant.DIRECTORY + "fixtureImportErrorTemplate" + ExcelConstant.SUFFIX, MessageUtils.message("excel.import.failed.report.name", new Object[0]) + ExcelConstant.SUFFIX, "澶瑰叿淇℃伅琛�", fails, null, null);
return this.ossBuilder.tempTemplate().putFile(template.getOriginalFilename(), template);
}
List<Fixture> fixtures = list();
- Map<String, Fixture> fixtureMap = (Map) fixtures.stream().collect(Collectors.toMap((v0) -> {
- return v0.getCode();
- }, v -> {
- return v;
- }));
+ Map<String, Fixture> fixtureMap = fixtures.stream().collect(Collectors.toMap(Fixture::getCode, v -> v));
+
fixtureData.forEach(fix -> {
if (fix.getFixtureGroupName().equals(CommonGroupEnum.ALL.getCode())) {
fix.setFixtureGroupName(CommonGroupEnum.UNASSORTED.getCode());
@@ -362,6 +235,10 @@
String fixtureCode = fix.getFixtureCode();
if (fixtureCodeSet.contains(fixtureCode)) {
String name = fix.getName();
+ update(Wrappers.<Fixture>lambdaUpdate().eq(Fixture::getCode, fixtureCode).set(Fixture::getName, Func.isBlank(name) ? fixtureCode : name));
+ this.commonGroupOfItemService.update(Wrappers.<CommonGroupOfItem>update().lambda().eq(CommonGroupOfItem::getItemId, ((Fixture)fixtureMap.get(fixtureCode)).getId()).set(CommonGroupOfItem::getGroupId, commonGroupNameMap.get(fix.getFixtureGroupName())));
+
+ /*
update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getCode();
}, fixtureCode)).set((v0) -> {
@@ -371,7 +248,7 @@
return v0.getItemId();
}, ((Fixture) fixtureMap.get(fixtureCode)).getId())).set((v0) -> {
return v0.getGroupId();
- }, commonGroupNameMap.get(fix.getFixtureGroupName())));
+ }, commonGroupNameMap.get(fix.getFixtureGroupName())));*/
return;
}
FixtureVO fixtureVO = new FixtureVO();
@@ -380,28 +257,30 @@
fixtureVO.setName(Func.isBlank(name2) ? fixtureCode : name2);
fixtureVO.setFixtureGroupId(String.valueOf(commonGroupNameMap.get(fix.getFixtureGroupName())));
fixtureVO.setFixtureGroupName(String.valueOf(commonGroupNameMap.get(fix.getFixtureGroupName())));
- fixtureVO.setToolAppendixVOList(new ArrayList());
+ fixtureVO.setToolAppendixVOList(new ArrayList<>());
fixtureVO.setFixtureStatus(TrayEnum.FixtureEnum.ACTIVATING.getStatus());
insert(fixtureVO, (Long) commonGroupNameMap.get(fix.getFixtureGroupName()));
});
return null;
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public List<GroupTreeVO> allGroupFixture(CommonGroupTypeVO vo) {
List<GroupTreeVO> groupFixture = ((FixtureMapper) this.baseMapper).groupFixture();
return TreeUtils.allGroupTree(vo, groupFixture);
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public FixtureVO updateFixture(FixtureVO vo) {
Fixture fixture = FixtureConvert.INSTANCE.convert(vo);
checkFixture(fixture);
updateById(fixture);
+ this.trayFixtureService.remove(Wrappers.<TrayFixture>lambdaQuery().eq(TrayFixture::getFixId, vo.getId()));
+ /*
this.trayFixtureService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getFixId();
- }, vo.getId()));
+ }, vo.getId()));*/
TrayFixture trayFixture = new TrayFixture().setFixId(vo.getId()).setTrayId(vo.getTrayId()).setFaceId(vo.getSurfaceId());
this.trayFixtureService.save(trayFixture);
return FixtureConvert.INSTANCE.convert(fixture);
@@ -432,13 +311,13 @@
}
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public List<FixtureVO> list(String keyword, Long groupId) {
IPage<FixtureVO> page = page(keyword, groupId, new Query().setSize(-1));
return page.getRecords();
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public IPage<FixtureVO> page(String keyword, Long groupId, Query query) {
if (Func.isNull(groupId) || ToolingConstant.FIXTURE_ROOT.equals(groupId)) {
return ((FixtureMapper) this.baseMapper).page(Condition.getPage(query), keyword, null);
@@ -447,7 +326,7 @@
return ((FixtureMapper) this.baseMapper).page(page, keyword, groupId);
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public FixtureVO detail(Long id) {
return ((FixtureMapper) this.baseMapper).detail(id);
}
--
Gitblit v1.9.3