From 95a87c5137cb5c8bde751dadccd8cc57a907cc3f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 四月 2024 20:03:26 +0800
Subject: [PATCH] 修改lambda错误
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java | 2
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/SearchController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java | 39 +++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomMaterialServiceImpl.java | 52 ++++------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java | 40 +++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java | 10 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/GalleryController.java | 10 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java | 42 +++----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java | 5
smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java | 51 +++------
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RoleController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/RoleServiceImpl.java | 17 +-
12 files changed, 108 insertions(+), 162 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java
index 2d74c66..7e64652 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/GlobalWcsController.java
@@ -1,18 +1,16 @@
package com.qianwen.smartman.modules.cps.controller;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
-import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.scanner.modular.annotation.DeleteResource;
@@ -21,6 +19,9 @@
import com.qianwen.core.scanner.modular.stereotype.ApiResource;
import com.qianwen.core.tenant.annotation.NonDS;
import com.qianwen.core.tool.api.R;
+import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
+import com.qianwen.smartman.common.utils.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.GlobalWcsConvert;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
@@ -30,19 +31,17 @@
import com.qianwen.smartman.modules.mdc.entity.WorkstationFeedbackDetail;
import com.qianwen.smartman.modules.mdc.enums.FeedbackDetailStatus;
import com.qianwen.smartman.modules.mdc.service.IWorkstationFeedbackDetailService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import springfox.documentation.annotations.ApiIgnore;
@Api(value = "鍏ㄥ眬宸ュ喌", tags = {"鍏ㄥ眬宸ュ喌"})
@RestController
@ApiResource({"blade-cps/global_wcs"})
@NonDS
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/GlobalWcsController.class */
public class GlobalWcsController {
private final IGlobalWcsService globalWcsService;
private final IWorkstationFeedbackDetailService feedbackDetailService;
@@ -61,9 +60,7 @@
if (!globalWcs.containsKey("type")) {
globalWcs.put("type", GlobalWcsTypeEnum.DEFAULT.getType());
}
- List<GlobalWcs> list = this.globalWcsService.list((Wrapper) Condition.getQueryWrapper(globalWcs, GlobalWcs.class).lambda().orderByAsc((v0) -> {
- return v0.getSeq();
- }));
+ List<GlobalWcs> list = this.globalWcsService.list(Condition.getQueryWrapper(globalWcs, GlobalWcs.class).lambda().orderByAsc(GlobalWcs::getSeq));
return R.data(GlobalWcsConvert.INSTANCE.convert(list));
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomMaterialServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomMaterialServiceImpl.java
index b038007..3d62d16 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomMaterialServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomMaterialServiceImpl.java
@@ -1,22 +1,25 @@
package com.qianwen.smartman.modules.cps.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.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
-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.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.CollectionUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.BomMaterialConvert;
import com.qianwen.smartman.modules.cps.entity.BomMaterial;
import com.qianwen.smartman.modules.cps.entity.BomVersion;
@@ -27,13 +30,8 @@
import com.qianwen.smartman.modules.cps.service.IBomVersionService;
import com.qianwen.smartman.modules.cps.vo.BomMaterialDetailVO;
import com.qianwen.smartman.modules.cps.vo.BomMaterialVO;
-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/cps/service/impl/BomMaterialServiceImpl.class */
public class BomMaterialServiceImpl extends BaseServiceImpl<BomMaterialMapper, BomMaterial> implements IBomMaterialService {
@Autowired
private IBomProcessService bomProcessService;
@@ -41,7 +39,7 @@
@Lazy
private IBomVersionService bomVersionService;
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean saveBomMaterial(Long bomId, String allPath, Long parentId, List<BomMaterialVO> bomMaterialVOList) {
bomMaterialVOList.forEach(i -> {
@@ -56,7 +54,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteBomMaterial(Long bomId) {
List<BomMaterial> list = list(Wrappers.<BomMaterial>query().lambda()
@@ -66,33 +64,33 @@
remove(Wrappers.<BomMaterial>update().lambda()
.eq(BomMaterial::getVersionId, bomId));
- List<Long> bomMaterialIdList = (List<Long>)list.stream().map(BomMaterial::getId).distinct().collect(Collectors.toList());
+ List<Long> bomMaterialIdList = list.stream().map(BomMaterial::getId).distinct().collect(Collectors.toList());
this.bomProcessService.deleteBomProcess(bomMaterialIdList);
return true;
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
public List<BomMaterialVO> getBomMaterialVOListByBomId(Long bomId) {
return BomMaterialConvert.INSTANCE.convert(list(Wrappers.<BomMaterial>query().lambda()
.in(BomMaterial::getVersionId, new Object[] { bomId })));
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
public BomMaterialDetailVO detail(Long id) {
return ((BomMaterialMapper) this.baseMapper).detail(id);
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
public List<BomMaterialDetailVO> list(Map<String, Object> params) {
return ((BomMaterialMapper) this.baseMapper).list(params);
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
public IPage<BomMaterialDetailVO> page(IPage<BomMaterialDetailVO> page, Map<String, Object> params) {
return page.setRecords(((BomMaterialMapper) this.baseMapper).page(page, params));
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
public Boolean insert(BomMaterialVO bomMaterialVO) {
if (Func.isEmpty(bomMaterialVO.getVersionId())) {
throw new ServiceException(MessageUtils.message("cps.production.bom.version.id.is.empty", new Object[0]));
@@ -104,25 +102,19 @@
List<BomMaterial> list = list(Wrappers.<BomMaterial>query().lambda()
.eq(BomMaterial::getVersionId, bomMaterialVO.getVersionId())
.eq(BomMaterial::getMaterialId, bomMaterialVO.getMaterialId()));
- /*
- List<BomMaterial> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.query().lambda().eq((v0) -> {
- return v0.getVersionId();
- }, bomMaterialVO.getVersionId())).eq((v0) -> {
- return v0.getMaterialId();
- }, bomMaterialVO.getMaterialId()));
- */
+
if (CollectionUtil.isNotEmpty(list)) {
throw new ServiceException(MessageUtils.message("cps.production.bom.version.has.same.bom.material", new Object[0]));
}
String allPath = "";
if (Func.isNotEmpty(bomMaterialVO.getParentId()) && bomMaterialVO.getParentId().compareTo((Long) 0L) > 0) {
- allPath = (String) Optional.ofNullable(((BomMaterial) getById(bomMaterialVO.getParentId())).getAllPath()).orElse(null);
+ allPath = Optional.ofNullable(getById(bomMaterialVO.getParentId()).getAllPath()).orElse(null);
}
saveBomMaterial(bomMaterialVO.getVersionId(), allPath, bomMaterialVO.getParentId(), Arrays.asList(bomMaterialVO));
return true;
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean removeBomMaterial(Long id) {
BomMaterial bomMaterial = (BomMaterial) getById(id);
@@ -140,7 +132,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IBomMaterialService
+ @Override
public List<BomMaterialDetailVO> tree(Map<String, Object> params) {
return ForestNodeMerger.merge(((BomMaterialMapper) this.baseMapper).list(params));
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java
index df1ce18..ca98182 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java
@@ -34,7 +34,7 @@
@Override
public List<WcsAndAchievementsVO> getWcsAndAchievements() {
- return ((GlobalWcsMapper) this.baseMapper).wcsAndAchievements();
+ return this.baseMapper.wcsAndAchievements();
}
@Override
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java
index 532d1f8..c8a9e9c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/TrayServiceImpl.java
@@ -1,15 +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.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.google.common.collect.Sets;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -18,17 +8,18 @@
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.apache.commons.compress.utils.Lists;
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.Lambda;
-import com.qianwen.smartman.common.utils.MessageUtils;
-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.alibaba.excel.write.merge.AbstractMergeStrategy;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Sets;
import com.qianwen.core.excel.util.ExcelUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
@@ -37,6 +28,13 @@
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.Lambda;
+import com.qianwen.smartman.common.utils.MessageUtils;
+import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.modules.cps.convert.ToolAppendixConvert;
import com.qianwen.smartman.modules.cps.convert.TrayConvert;
import com.qianwen.smartman.modules.cps.dto.TrayFaceDTO;
@@ -72,9 +70,7 @@
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
public class TrayServiceImpl extends BladeServiceImpl<TrayMapper, Tray> implements ITrayService {
@@ -434,9 +430,7 @@
}
private void validCode(String code) {
- long count = count(Lambda.eq((v0) -> {
- return v0.getCode();
- }, code));
+ long count = count(Lambda.eq(Tray::getCode, code));
ThrowFun.isTrue(count > 0).throwMessage(MessageUtils.message("cps.tray.code.exist", new Object[0]));
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java
index 709ce01..9e3c50c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/controller/FmsOrderProcessController.java
@@ -28,6 +28,7 @@
import com.qianwen.smartman.modules.fms.dto.ProgramIssuanceDTO;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcess;
import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessFixture;
+import com.qianwen.smartman.modules.fms.entity.FmsOrderProcessTool;
import com.qianwen.smartman.modules.fms.service.IFmsOrderProcessFixtureService;
import com.qianwen.smartman.modules.fms.service.IFmsOrderProcessService;
import com.qianwen.smartman.modules.fms.service.IFmsOrderProcessToolService;
@@ -79,9 +80,7 @@
List<FmsOrderProcessVO> convert = FmsOrderProcessConvert.INSTANCE.convert(list);
convert.forEach(item -> {
List<FmsOrderProcessFixtureVO> fixtureVOList = FmsOrderProcessFixtureConvert.INSTANCE.convert(this.fmsOrderProcessFixtureService.list(Lambda.eq(FmsOrderProcessFixture::getOrderProcessId, item.getId())));
- List<FmsOrderProcessToolVO> toolVOList = FmsOrderProcessToolConvert.INSTANCE.convert(this.fmsOrderProcessToolService.list(Lambda.eq((v0) -> {
- return v0.getOrderProcessId();
- }, item.getId())));
+ List<FmsOrderProcessToolVO> toolVOList = FmsOrderProcessToolConvert.INSTANCE.convert(this.fmsOrderProcessToolService.list(Lambda.eq(FmsOrderProcessTool::getOrderProcessId, item.getId())));
item.setFixtureList(fixtureVOList);
item.setToolList(toolVOList);
});
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java
index b6c94c8..9362d43 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/fms/service/impl/FmsOrderServiceImpl.java
@@ -86,7 +86,6 @@
import cn.hutool.core.bean.BeanUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/fms/service/impl/FmsOrderServiceImpl.class */
public class FmsOrderServiceImpl extends BaseServiceImpl<FmsOrderMapper, FmsOrder> implements IFmsOrderService {
private static final Logger log = LoggerFactory.getLogger(FmsOrderServiceImpl.class);
private final IDictService dictService;
@@ -124,7 +123,7 @@
this.paramService = paramService;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public IPage<FmsOrderVO> getPageOrder(FmsOrderQueryVO fmsOrderQueryVO, Query query) {
String[] startTimeRange = (String[]) Optional.ofNullable(fmsOrderQueryVO.getPlanStartTime()).map(item -> {
return Func.split(item, ",");
@@ -197,7 +196,7 @@
return fmsOrderVOS.get(0);
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<CraftRoutingDetailVO> listCraft() {
List<CraftRoutingDetailVO> craftRoutingDetailVOS = new ArrayList<>();
List<CraftRoutingVO> craftRoutingVOS = CraftRoutingConvert.INSTANCE.convert(this.craftRoutingService.list());
@@ -208,7 +207,7 @@
return craftRoutingDetailVOS;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<CraftRoutingDetailVO> listProductionCraft(String productionId) {
List<CraftRoutingDetailVO> craftRoutingDetailVOS = new ArrayList<>();
CraftRoutingDetailVO craftRoutingDetailVO = this.craftRoutingService.getCraftByProduction(Long.valueOf(productionId));
@@ -225,14 +224,7 @@
List<CraftVersionDTO> versionDTOS = versionList.stream().filter(versionDTO -> {
List<CraftVersionLine> versionLines = this.craftVersionLineService.list(Lambda.eq(CraftVersionLine::getVersionId, versionDTO.getId()));
List<Long> groupIds = versionLines.stream().map(CraftVersionLine::getGroupId).collect(Collectors.toList());
- /*
- List<CraftVersionLine> versionLines = this.craftVersionLineService.list(Lambda.eq((v0) -> {
- return v0.getVersionId();
- }, versionDTO.getId()));
- List<Long> groupIds = (List) versionLines.stream().map((v0) -> {
- return v0.getGroupId();
- }).collect(Collectors.toList());
- */
+
/*
if (Func.isNotEmpty(groupIds)) {
return this.commonGroupService.list((Wrapper) Wrappers.query().lambda().in((v0) -> {
@@ -253,7 +245,7 @@
return craftRoutingDetailVOS;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional
public FmsOrderDetailVO save(FmsOrderVO fmsOrderVO) {
FmsOrder fmsOrder = FmsOrderConvert.INSTANCE.convert(fmsOrderVO);
@@ -328,7 +320,7 @@
return fmsOrderDetailVO;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional
public void saveWorkstation(FmsOrderDetailVO fmsOrderDetailVO) {
List<FmsOrderProcess> processList = fmsOrderDetailVO.getProcessList();
@@ -348,7 +340,7 @@
});
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public FmsOrderStatusStatVO orderStatistics() {
List<Map<String, Object>> statusList = listMaps(new QueryWrapper<FmsOrder>()
.select(new String[] { Lambda.getName(FmsOrder::getOrderStatus), "count(1) as \"count\"" }).lambda()
@@ -389,7 +381,7 @@
}).orElse(0L)));
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<FmsOrderProductionStatVO> productionStatistics(final String orderId) {
List<Map<String, Object>> data = ((FmsOrderMapper) this.baseMapper).productionStatistics(orderId);
return data.stream().map(item -> {
@@ -397,7 +389,7 @@
}).collect(Collectors.toList());
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public FmsOrderVO pause(final String orderId) {
FmsOrder fmsOrder = (FmsOrder) getById(orderId);
@@ -411,7 +403,7 @@
throw new ServiceException(MessageUtils.message("fms.order.not.need.pause", new Object[0]));
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public List<FmsOrderVO> pauseBatch(List<String> orderIds) {
List<FmsOrderVO> list = new ArrayList<>();
@@ -422,7 +414,7 @@
return list;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional
public FmsOrderVO start(final String orderId) {
FmsOrderVO wrapper;
@@ -469,7 +461,7 @@
return wrapper;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public List<FmsOrderVO> startOrders(List<String> orderIds) {
List<FmsOrderVO> result = Lists.newArrayList();
@@ -763,7 +755,7 @@
return new ArrayList<>();
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public FmsOrderVO publish(final String orderId) {
FmsOrder fmsOrder = (FmsOrder) getById(orderId);
@@ -791,7 +783,7 @@
return wrapper(fmsOrder);
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public Boolean stopDownOrder() {
FmsInstructionRecord lastRecord = this.fmsInstructionRecordService.getLastRecord();
if (lastRecord == null) {
@@ -805,7 +797,7 @@
return Boolean.TRUE;
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean removeOrder(IdsVO ids) {
List<Long> orderIds = Func.toLongList(ids.getIds());
@@ -819,7 +811,7 @@
return Boolean.valueOf(removeBatchByIds(orderIds));
}
- @Override // org.springblade.modules.fms.service.IFmsOrderService
+ @Override
public List<String> listWorkstationByTrayCode(String trayCode) {
return ((FmsOrderMapper) this.baseMapper).listWorkstationByTrayCode(trayCode);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/GalleryController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/GalleryController.java
index dd1974b..3c46a7e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/GalleryController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/GalleryController.java
@@ -43,7 +43,6 @@
@Api(value = "鍥惧簱绠＄悊", tags = {"鍥惧簱绠＄悊"})
@ApiResource({"blade-system/gallery"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/GalleryController.class */
public class GalleryController extends BladeController {
private IGalleryService galleryService;
private IGalleryItemService galleryItemService;
@@ -79,12 +78,7 @@
List<GalleryTreeVO> treeVOS = GalleryConvert.INSTANCE.convertTree(list);
for (GalleryTreeVO tree : treeVOS) {
List<GalleryItem> items = this.galleryItemService.list(Lambda.eq(GalleryItem::getGalleryId, tree.getId()).limit(count).orderByDesc(GalleryItem::getId));
- /*
- List<GalleryItem> items = this.galleryItemService.list((Wrapper) Lambda.eq((v0) -> {
- return v0.getGalleryId();
- }, tree.getId()).limit(count).orderByDesc((v0) -> {
- return v0.getId();
- }));*/
+
tree.setChildren(GalleryItemConvert.INSTANCE.convert(items));
}
return R.data(treeVOS);
@@ -127,7 +121,7 @@
@ApiOperationSupport(order = 6)
@DeleteResource({"/remove"})
@ApiOperation(value = "鍥惧簱鍒犻櫎", notes = "浼犲叆ids")
- public R remove(@ApiParam(value = "涓婚敭", required = true) @RequestBody List<String> ids) {
+ public R<Void> remove(@ApiParam(value = "涓婚敭", required = true) @RequestBody List<String> ids) {
if (ids.isEmpty()) {
return R.status(false);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RoleController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RoleController.java
index 5f0b385..9dcda31 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RoleController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/RoleController.java
@@ -45,7 +45,6 @@
@RestController
@ApiResource({"blade-system/role"})
@NonDS
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/RoleController.class */
public class RoleController extends BladeController {
private final IRoleService roleService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/SearchController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/SearchController.java
index 6ba84ea..03dd962 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/SearchController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/SearchController.java
@@ -31,7 +31,6 @@
@RestController
@ApiResource({"blade-system/search"})
@NonDS
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/SearchController.class */
public class SearchController {
private final IRoleService roleService;
private final IDataScopeManagerService deptService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
index 5896971..316c925 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/TenantController.java
@@ -140,10 +140,7 @@
@ApiOperation(value = "璇︽儏", notes = "浼犲叆tenant")
public R<List<Tenant>> findByName(String name) {
List<Tenant> list = this.tenantService.list(Wrappers.<Tenant>query().lambda().like(Tenant::getTenantName, name));
- /*
- List<Tenant> list = this.tenantService.list((Wrapper) Wrappers.query().lambda().like((v0) -> {
- return v0.getTenantName();
- }, name));*/
+
return R.data(list);
}
@@ -152,10 +149,7 @@
@ApiOperation(value = "閰嶇疆淇℃伅", notes = "浼犲叆domain")
public R<Kv> info(String domain) {
Tenant tenant = this.tenantService.getOne(Lambda.eq(Tenant::getTenantId, "000000"));
- /*
- Tenant tenant = (Tenant) this.tenantService.getOne(Lambda.eq((v0) -> {
- return v0.getTenantId();
- }, "000000"));*/
+
Kv kv = Kv.create();
if (tenant != null) {
kv.set("tenantId", tenant.getTenantId()).set("domain", tenant.getDomainName()).set("backgroundUrl", tenant.getBackgroundUrl()).set("identify", LicenseUtil.getMac());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/RoleServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/RoleServiceImpl.java
index d4b2848..e16f86a 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/RoleServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/service/impl/RoleServiceImpl.java
@@ -34,7 +34,6 @@
@Service
@Validated
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/service/impl/RoleServiceImpl.class */
public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IRoleService {
private final IRoleMenuService roleMenuService;
private final IRoleScopeService roleScopeService;
@@ -44,12 +43,12 @@
this.roleScopeService = roleScopeService;
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
public IPage<RoleVO> selectRolePage(IPage<RoleVO> page, RoleVO role) {
return page.setRecords(((RoleMapper) this.baseMapper).selectRolePage(page, role));
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
public List<RoleVO> tree(String tenantId) {
String userRole = AuthUtil.getUserRole();
String excludeRole = null;
@@ -59,7 +58,7 @@
return ForestNodeMerger.merge(((RoleMapper) this.baseMapper).tree(tenantId, excludeRole));
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public boolean grant(@NotEmpty List<Long> roleIds, List<Long> menuIds, List<Long> dataScopeIds, List<Long> apiScopeIds) {
grantRoleMenu(roleIds, menuIds);
@@ -173,7 +172,7 @@
return true;
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
public String getRoleIds(String tenantId, String roleNames) {
List<Role> roleList = this.baseMapper.selectList(Wrappers.<Role>query().lambda().eq(Role::getTenantId, tenantId).in(Role::getRoleName, Func.toStrList(roleNames)));
@@ -191,17 +190,17 @@
return null;
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
public List<String> getRoleNames(String roleIds) {
return ((RoleMapper) this.baseMapper).getRoleNames(Func.toLongArray(roleIds));
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
public List<String> getRoleAliases(String roleIds) {
return ((RoleMapper) this.baseMapper).getRoleAliases(Func.toLongArray(roleIds));
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
public Role submit(Role role) {
if (!AuthUtil.isAdministrator() && Func.toStr(role.getRoleAlias()).equals("administrator")) {
throw new ServiceException("鏃犳潈闄愬垱寤鸿秴绠¤鑹诧紒");
@@ -222,7 +221,7 @@
return role;
}
- @Override // org.springblade.modules.system.service.IRoleService
+ @Override
public List<RoleVO> search(String roleName, Long parentId) {
LambdaQueryWrapper<Role> lambda = Wrappers.<Role>query().lambda();
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java
index 6ad760d..4e67bd9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/tdengine/service/impl/WorkstationDynamicCollectServiceImpl.java
@@ -1,31 +1,31 @@
package com.qianwen.smartman.modules.tdengine.service.impl;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.common.enums.DynamicCalculationWcsDataType;
-import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
-import com.qianwen.smartman.common.utils.DelayList;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
-import com.qianwen.smartman.common.utils.Lambda;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.tool.utils.SpringUtil;
+import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
+import com.qianwen.smartman.common.enums.DynamicCalculationWcsDataType;
+import com.qianwen.smartman.common.enums.WcsDataTypeEnums;
+import com.qianwen.smartman.common.utils.DelayList;
+import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.modules.cps.dto.CalendarShiftTimeSlicesDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.entity.WorkstationWcs;
@@ -41,9 +41,8 @@
import com.qianwen.smartman.modules.visual.dto.VisualTimeDTO;
import com.qianwen.smartman.modules.visual.utils.VisualUtils;
import com.qianwen.smartman.modules.visual.vo.VisualUsagePolicyEnum;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
@Service
public class WorkstationDynamicCollectServiceImpl implements IWorkstationDynamicCollectService {
@@ -140,14 +139,12 @@
//workstationIds.forEach(workstationId -> this.workstationWcsService.list((Wrapper)((ExtraLambdaQueryWrapper)Lambda.eq(WorkstationWcs::getWorkstationId, workstationId).isNotNull(WorkstationWcs::getUsageId)).select(new SFunction[] { WorkstationWcs::getUsageId })).stream().map(WorkstationWcs::getUsageId).map(this.workstationWcsUsageService::getById).forEach(()));
workstationIds.forEach(workstationId -> {
- //Stream map = this.workstationWcsService.list(((ExtraLambdaQueryWrapper) Lambda.eq(WorkstationWcs::getWorkstationId, workstationId).isNotNull(WorkstationWcs::getUsageId).select(new SFunction[] { WorkstationWcs::getUsageId }).stream().map(WorkstationWcs::getUsageId);
Stream<Long> map = this.workstationWcsService.list(Lambda.<WorkstationWcs>eq(WorkstationWcs::getWorkstationId, workstationId).isNotNull(WorkstationWcs::getUsageId)
.select(WorkstationWcs::getUsageId )).stream().map(WorkstationWcs::getUsageId);
////.map(WorkstationWcs::getUsageId);
- IWorkstationWcsUsageService iWorkstationWcsUsageService = this.workstationWcsUsageService;
- //iWorkstationWcsUsageService.getClass();
- map.map((v1) -> {
- return this.workstationWcsUsageService.getById(v1);
+
+ map.map((usageId) -> {
+ return this.workstationWcsUsageService.getById(usageId);
}).forEach(it -> {
removeTable(workstationId, it.getUsageCode(), it.getCollectType());
});
@@ -160,17 +157,7 @@
return this.workstationWcsService.list(Lambda.<WorkstationWcs>eq(WorkstationWcs::getUsageId, usageId).select(WorkstationWcs::getWorkstationId)).stream()
.filter(Func::notNull)
.map(WorkstationWcs::getWorkstationId).collect(Collectors.toList());
- /*
- return (List) this.workstationWcsService.list(Lambda.eq((v0) -> {
- return v0.getUsageId();
- }, usageId).select((v0) -> {
- return v0.getWorkstationId();
- })).stream().filter((v0) -> {
- return Func.notNull(v0);
- }).map((v0) -> {
- return v0.getWorkstationId();
- }).collect(Collectors.toList());
- */
+
}
@Override
--
Gitblit v1.9.3