From 4599eb51d8672245f1065b2df85481ed40fc0da0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 12 四月 2024 22:12:07 +0800
Subject: [PATCH] 修改lambda错误，删除无用注释
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CraftRoutingController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java | 26
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseStationController.java | 38 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayStorageController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java | 43 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomProcessServiceImpl.java | 37 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/FixtureServiceImpl.java | 91 ++---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseAreaController.java | 29
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDaytimeServiceImpl.java | 7
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java | 18
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TraySurfaceController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckItemServiceImpl.java | 57 --
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java | 121 +++---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftVersionLineServiceImpl.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java | 8
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseGridController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDayServiceImpl.java | 5
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java | 91 ++---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java | 21
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeePostServiceImpl.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomVersionServiceImpl.java | 41 -
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessAssociationController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/GlobalWcsServiceImpl.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitBusinessServiceImpl.java | 3
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java | 57 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupOfItemServiceImpl.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java | 51 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckProjectServiceImpl.java | 62 +--
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java | 19
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductController.java | 34 +-
smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java | 29
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessController.java | 1
smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayFixtureController.java | 1
41 files changed, 388 insertions(+), 521 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CraftRoutingController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CraftRoutingController.java
index 6578df2..121bfae 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CraftRoutingController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CraftRoutingController.java
@@ -31,7 +31,6 @@
@Api(value = "宸ヨ壓璺嚎controller", tags = {"宸ヨ壓璺嚎controller"})
@ApiResource({"blade-cps/craft-routing"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/CraftRoutingController.class */
public class CraftRoutingController extends BladeController {
private final ICraftRoutingService craftRoutingService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java
index 21af201..e2bb9c2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/MaterialTypeController.java
@@ -1,17 +1,16 @@
package com.qianwen.smartman.modules.cps.controller;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.scanner.modular.annotation.DeleteResource;
@@ -24,20 +23,21 @@
import com.qianwen.core.tenant.mp.TenantEntity;
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.modules.cps.convert.MaterialTypeConvert;
import com.qianwen.smartman.modules.cps.entity.MaterialType;
import com.qianwen.smartman.modules.cps.service.IMaterialTypeService;
import com.qianwen.smartman.modules.cps.vo.MaterialTypeAddVO;
import com.qianwen.smartman.modules.cps.vo.MaterialTypeUpdateVO;
import com.qianwen.smartman.modules.cps.vo.MaterialTypeVO;
-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.ApiOperation;
+import io.swagger.annotations.ApiParam;
@ApiResource({"blade-cps/material-type"})
@Api(value = "鐗╂枡绫诲瀷", tags = {"鐗╂枡绫诲瀷"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/MaterialTypeController.class */
public class MaterialTypeController extends BladeController {
private final IMaterialTypeService materialTypeService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java
index 0692f89..9805a18 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/OrganizationController.java
@@ -35,7 +35,6 @@
@RestController
@ApiResource({"blade-cps/organization"})
@NonDS
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/OrganizationController.class */
public class OrganizationController extends BladeController {
private final IOrganizationService organizationService;
private final OssBuilder ossBuilder;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessAssociationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessAssociationController.java
index 727b45b..a389d29 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessAssociationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessAssociationController.java
@@ -26,7 +26,6 @@
@ApiResource({"blade-cps/process-association"})
@NonDS
@Validated
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ProcessAssociationController.class */
public class ProcessAssociationController extends BladeController {
private final IProcessAssociationService processAssociationService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessController.java
index 6c27cc7..9f8bb9e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProcessController.java
@@ -43,7 +43,6 @@
@ApiResource({"blade-cps/process"})
@NonDS
@Validated
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ProcessController.class */
public class ProcessController extends BladeController {
public final IProcessService processService;
private final OssBuilder ossBuilder;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductController.java
index 5e4ece0..f7792bb 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductController.java
@@ -1,19 +1,19 @@
package com.qianwen.smartman.modules.cps.controller;
-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.core.toolkit.support.SFunction;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Objects;
+
import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+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 org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.support.Condition;
@@ -28,6 +28,8 @@
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.RegionCache;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.ProductConvert;
import com.qianwen.smartman.modules.cps.entity.Product;
import com.qianwen.smartman.modules.cps.service.IProductService;
@@ -40,16 +42,14 @@
import com.qianwen.smartman.modules.cps.vo.ProductUpdateVO;
import com.qianwen.smartman.modules.cps.vo.ProductVO;
import com.qianwen.smartman.modules.resource.service.impl.SystemResourceServiceImpl;
-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 org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
@Api(value = "浜у搧淇℃伅绠＄悊", tags = {"浜у搧淇℃伅绠＄悊"})
@ApiResource({"blade-cps/product"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ProductController.class */
public class ProductController extends BladeController {
private final IProductService productService;
private final SystemResourceServiceImpl systemResourceService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java
index 3135d0f..e20579f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ShiftOffDayController.java
@@ -32,7 +32,6 @@
@Api(value = "ShiftOffDay绠＄悊", tags = {"ShiftOffDay绠＄悊"})
@ApiResource({"blade-cps/shift-off-day"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ShiftOffDayController.class */
public class ShiftOffDayController extends BladeController {
private final IShiftOffDayService shiftOffDayService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java
index a6a6565..5f3168b 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockInTypeController.java
@@ -35,7 +35,6 @@
@Api(value = "StockInType绠＄悊", tags = {"StockInType绠＄悊"})
@ApiResource({"blade-cps/stock-in-type"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/StockInTypeController.class */
public class StockInTypeController extends BladeController {
private final IStockInTypeService stockInTypeService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java
index 7bca418..6502ee9 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/StockOutTypeController.java
@@ -35,7 +35,6 @@
@Api(value = "StockOutType绠＄悊", tags = {"StockOutType绠＄悊"})
@ApiResource({"blade-cps/stock-out-type"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/StockOutTypeController.class */
public class StockOutTypeController extends BladeController {
private final IStockOutTypeService stockOutTypeService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java
index ff94efc..72f1a79 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/SupplierController.java
@@ -30,7 +30,6 @@
@ApiResource({"blade-cps/supplier"})
@NonDS
@Validated
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/SupplierController.class */
public class SupplierController extends BladeController {
private final ISupplierService supplierService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java
index 1e73581..ef7d2fc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ToolAppendixController.java
@@ -20,7 +20,6 @@
@Api(value = "闄勪欢鏂囦欢绠＄悊", tags = {"闄勪欢鏂囦欢绠＄悊"})
@ApiResource({"blade-cps/tool-appendix"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ToolAppendixController.class */
public class ToolAppendixController extends BladeController {
private final IToolAppendixService toolAppendixService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayController.java
index e4cbd50..b053763 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayController.java
@@ -40,7 +40,6 @@
@Api(value = "鎵樼洏controller", tags = {"鎵樼洏controller"})
@ApiResource({"blade-cps/tray"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/TrayController.class */
public class TrayController extends BladeController {
private final ITrayService trayService;
private final ISystemResourceService systemResourceService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayFixtureController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayFixtureController.java
index aa3da78..d9202c4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayFixtureController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayFixtureController.java
@@ -27,7 +27,6 @@
@Api(value = "鎵樼洏闈�-澶瑰叿绠＄悊", tags = {"鎵樼洏闈�-澶瑰叿绠＄悊"})
@ApiResource({"blade-cps/tray-fixture"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/TrayFixtureController.class */
public class TrayFixtureController extends BladeController {
private final ITrayFixtureService trayFixtureService;
private final ISystemResourceService systemResourceService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayStorageController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayStorageController.java
index b802e3e..04bb2c5 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayStorageController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TrayStorageController.java
@@ -30,7 +30,6 @@
@Api(value = "鎵樼洏瀛樻斁绠＄悊", tags = {"鎵樼洏瀛樻斁绠＄悊"})
@ApiResource({"blade-cps/tray-storage"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/TrayStorageController.class */
public class TrayStorageController extends BladeController {
private final ITrayStorageService trayStorageService;
private final ISystemResourceService systemResourceService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TraySurfaceController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TraySurfaceController.java
index 418a544..cdea220 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TraySurfaceController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/TraySurfaceController.java
@@ -25,7 +25,6 @@
@Api(value = "鎵樼洏闈㈢鐞�", tags = {"鎵樼洏闈㈢鐞�"})
@ApiResource({"blade-cps/tray-surface"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/TraySurfaceController.class */
public class TraySurfaceController extends BladeController {
private ITraySurfaceService traySurfaceService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseAreaController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseAreaController.java
index 5bd3548..4d0a2a2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseAreaController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseAreaController.java
@@ -1,17 +1,18 @@
package com.qianwen.smartman.modules.cps.controller;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+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.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import java.util.Map;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.mp.support.Query;
@@ -24,6 +25,7 @@
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.node.ForestNodeMerger;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.modules.cps.convert.WarehouseAreaConvert;
import com.qianwen.smartman.modules.cps.entity.WarehouseArea;
import com.qianwen.smartman.modules.cps.entity.WarehouseStation;
@@ -32,16 +34,15 @@
import com.qianwen.smartman.modules.cps.vo.WarehouseAreaSubmitVO;
import com.qianwen.smartman.modules.cps.vo.WarehouseAreaUpdateVO;
import com.qianwen.smartman.modules.cps.vo.WarehouseAreaVO;
-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.ApiOperation;
+import io.swagger.annotations.ApiParam;
import springfox.documentation.annotations.ApiIgnore;
@Api(value = "搴撳尯绠＄悊", tags = {"搴撳尯绠＄悊"})
@ApiResource({"blade-cps/warehouse-area"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WarehouseAreaController.class */
public class WarehouseAreaController extends BladeController {
private final IWarehouseStationService warehouseStationService;
private IWarehouseAreaService warehouseAreaService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseGridController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseGridController.java
index 969cd73..c39eb24 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseGridController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseGridController.java
@@ -35,7 +35,6 @@
@Api(value = "搴撳尯璐ф牸绠＄悊", tags = {"搴撳尯璐ф牸绠＄悊"})
@ApiResource({"blade-cps/warehouse-grid"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WarehouseGridController.class */
public class WarehouseGridController extends BladeController {
private IWarehouseGridService warehouseGridService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseStationController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseStationController.java
index bbc8f61..c5c4674 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseStationController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WarehouseStationController.java
@@ -1,18 +1,19 @@
package com.qianwen.smartman.modules.cps.controller;
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+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 org.springframework.web.multipart.MultipartFile;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.core.boot.ctrl.BladeController;
import com.qianwen.core.mp.support.Query;
import com.qianwen.core.oss.model.BladeFile;
@@ -24,6 +25,7 @@
import com.qianwen.core.secure.annotation.PreAuth;
import com.qianwen.core.tool.api.R;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.modules.cps.convert.WarehouseStationConvert;
import com.qianwen.smartman.modules.cps.entity.WarehouseGrid;
import com.qianwen.smartman.modules.cps.entity.WarehouseStation;
@@ -33,16 +35,15 @@
import com.qianwen.smartman.modules.cps.vo.WarehouseStationVO;
import com.qianwen.smartman.modules.resource.enums.TemplateEnum;
import com.qianwen.smartman.modules.resource.service.impl.SystemResourceServiceImpl;
-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 org.springframework.web.multipart.MultipartFile;
+
+import cn.hutool.core.collection.CollectionUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
@Api(value = "搴撳尯搴撲綅绠＄悊", tags = {"搴撳尯搴撲綅绠＄悊"})
@ApiResource({"blade-cps/warehouse-station"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WarehouseStationController.class */
public class WarehouseStationController extends BladeController {
private final IWarehouseStationService warehouseStationService;
private final SystemResourceServiceImpl systemResourceService;
@@ -129,9 +130,6 @@
@ApiOperation("鑾峰彇搴撲綅涓嬬殑璐ф牸鏁伴噺")
public R<Long> getGridCount(@RequestParam(value = "id", required = true) String id) {
return R.data(Long.valueOf(this.warehouseGridService.count(Wrappers.<WarehouseGrid>lambdaQuery().eq(WarehouseGrid::getStationId, id))));
- /*
- return R.data(Long.valueOf(this.warehouseGridService.count((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getStationId();
- }, id))));*/
+
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java
index 369cc06..3a72655 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WebSocketTestController.java
@@ -20,7 +20,6 @@
@ApiResource({"blade-cps/test"})
@Api(value = "娴嬭瘯websocket", tags = {"娴嬭瘯websocket"})
@RestController
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WebSocketTestController.class */
public class WebSocketTestController {
@RequestMapping({"/send-message"})
public R<Boolean> sendMessage() {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomProcessServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomProcessServiceImpl.java
index afd4e4e..e77b8df 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomProcessServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomProcessServiceImpl.java
@@ -1,15 +1,18 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Map;
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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.BomProcessConvert;
import com.qianwen.smartman.modules.cps.entity.BomProcess;
import com.qianwen.smartman.modules.cps.entity.BomVersion;
@@ -21,26 +24,22 @@
import com.qianwen.smartman.modules.cps.vo.BomProcessDeleteVO;
import com.qianwen.smartman.modules.cps.vo.BomProcessDetailVO;
import com.qianwen.smartman.modules.cps.vo.BomProcessVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/BomProcessServiceImpl.class */
public class BomProcessServiceImpl extends BaseServiceImpl<BomProcessMapper, BomProcess> implements IBomProcessService {
@Autowired
@Lazy
private IBomVersionService bomVersionService;
- @Override // org.springblade.modules.cps.service.IBomProcessService
+ @Override
public Boolean saveBomProcess(Long bomId, Long bomMaterialId, List<BomProcessVO> bomProcessVOList) {
- List<Long> processIdList = (List) bomProcessVOList.stream().map((v0) -> {
+ List<Long> processIdList = bomProcessVOList.stream().map((v0) -> {
return v0.getProcessId();
}).distinct().collect(Collectors.toList());
if (processIdList.size() != bomProcessVOList.size()) {
throw new ServiceException(MessageUtils.message("cps.production.bom.material.process.is.repeat", new Object[0]));
}
- List<BomProcess> list = (List) bomProcessVOList.stream().map(i -> {
+ List<BomProcess> list = bomProcessVOList.stream().map(i -> {
BomProcess bomProcess = new BomProcess();
bomProcess.setBomMaterialId(bomMaterialId);
bomProcess.setMolecule(i.getMolecule());
@@ -52,27 +51,23 @@
return Boolean.valueOf(saveBatch(list));
}
- @Override // org.springblade.modules.cps.service.IBomProcessService
+ @Override
public Boolean deleteBomProcess(List<Long> bomMaterialIdList) {
return Boolean.valueOf(remove(Wrappers.<BomProcess>update().lambda()
.in(BomProcess::getBomMaterialId, bomMaterialIdList)));
- /*
- return Boolean.valueOf(remove((Wrapper) Wrappers.update().lambda().in((v0) -> {
- return v0.getBomMaterialId();
- }, bomMaterialIdList)));*/
}
- @Override // org.springblade.modules.cps.service.IBomProcessService
+ @Override
public List<BomProcessDetailVO> getBomProcessDetailVOList(Map<String, Object> params) {
return ((BomProcessMapper) this.baseMapper).getBomProcessDetailVOList(params);
}
- @Override // org.springblade.modules.cps.service.IBomProcessService
+ @Override
public IPage<BomProcessDetailVO> getBomProcessDetailVOPage(IPage<BomProcessDetailVO> page, Map<String, Object> params) {
return page.setRecords(((BomProcessMapper) this.baseMapper).getBomProcessDetailVOPage(page, params));
}
- @Override // org.springblade.modules.cps.service.IBomProcessService
+ @Override
public BomProcessVO addBomProcess(BomProcessAddVO bomProcessAddVO) {
BomVersion bomVersion = (BomVersion) this.bomVersionService.getById(bomProcessAddVO.getBomId());
if (BomVersionStatusEnum.FINALIZED.getStatus().equals(bomVersion.getVersionStatus())) {
@@ -88,7 +83,7 @@
return BomProcessConvert.INSTANCE.convert(bomProcess);
}
- @Override // org.springblade.modules.cps.service.IBomProcessService
+ @Override
public Boolean removeBomProcessById(BomProcessDeleteVO bomProcessDeleteVO) {
BomVersion bomVersion = (BomVersion) this.bomVersionService.getById(bomProcessDeleteVO.getBomId());
if (BomVersionStatusEnum.FINALIZED.getStatus().equals(bomVersion.getVersionStatus())) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomVersionServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomVersionServiceImpl.java
index 3f33672..3a3d222 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomVersionServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/BomVersionServiceImpl.java
@@ -1,18 +1,19 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+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.secure.utils.AuthUtil;
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.BomVersionConvert;
import com.qianwen.smartman.modules.cps.entity.BomVersion;
import com.qianwen.smartman.modules.cps.enums.BomVersionStatusEnum;
@@ -26,11 +27,8 @@
import com.qianwen.smartman.modules.system.service.IBasCoderuleService;
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;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/BomVersionServiceImpl.class */
public class BomVersionServiceImpl extends BaseServiceImpl<BomVersionMapper, BomVersion> implements IBomVersionService {
private static final Logger log = LoggerFactory.getLogger(BomVersionServiceImpl.class);
private final IBasCoderuleService basCoderuleService;
@@ -43,7 +41,7 @@
this.bomMaterialService = bomMaterialService;
}
- @Override // org.springblade.modules.cps.service.IBomVersionService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public BomVersion insert(BomVersionVO bomVersionVO) {
BomVersion bomVersion = BomVersionConvert.INSTANCE.convert(bomVersionVO);
@@ -59,7 +57,7 @@
return bomVersion;
}
- @Override // org.springblade.modules.cps.service.IBomVersionService
+ @Override
public BomVersionVO update(BomVersionUpdateVO bomVersionUpdateVO) {
BomVersion bomVersion = (BomVersion) getById(bomVersionUpdateVO.getId());
if (BomVersionStatusEnum.FINALIZED.getStatus().equals(bomVersion.getVersionStatus())) {
@@ -80,12 +78,12 @@
return BomVersionConvert.INSTANCE.convert(bomVersion);
}
- @Override // org.springblade.modules.cps.service.IBomVersionService
+ @Override
public BomVersionDetailVO getVersionById(Long id) {
return ((BomVersionMapper) this.baseMapper).getVersionById(id);
}
- @Override // org.springblade.modules.cps.service.IBomVersionService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean remove(Long id) {
BomVersion bomVersion = (BomVersion) getById(id);
@@ -97,7 +95,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IBomVersionService
+ @Override
public Boolean fixVersion(Long id) {
List<BomMaterialVO> bomMaterialVOList = this.bomMaterialService.getBomMaterialVOListByBomId(id);
if (CollectionUtil.isEmpty(bomMaterialVOList)) {
@@ -105,24 +103,13 @@
}
return Boolean.valueOf(update(Wrappers.<BomVersion>update().lambda().set(BomVersion::getVersionStatus, BomVersionStatusEnum.FINALIZED.getStatus()).eq(BomVersion::getId, id)));
- /*
- return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().set((v0) -> {
- return v0.getVersionStatus();
- }, BomVersionStatusEnum.FINALIZED.getStatus())).eq((v0) -> {
- return v0.getId();
- }, id)));*/
+
}
- @Override // org.springblade.modules.cps.service.IBomVersionService
+ @Override
public Boolean cancelFixVersion(Long id) {
return Boolean.valueOf(update(Wrappers.<BomVersion>update().lambda().set(BomVersion::getVersionStatus, BomVersionStatusEnum.DEFAULT.getStatus()).eq(BomVersion::getId, id)));
- /*
- return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.update().lambda().set((v0) -> {
- return v0.getVersionStatus();
- }, BomVersionStatusEnum.DEFAULT.getStatus())).eq((v0) -> {
- return v0.getId();
- }, id)));
- */
+
}
private boolean checkNameIsExist(String version, Long id, Long productId) {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDayServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDayServiceImpl.java
index f895316..5aecc87 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDayServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDayServiceImpl.java
@@ -9,7 +9,6 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/CalendarDayServiceImpl.class */
public class CalendarDayServiceImpl extends ServiceImpl<CalendarDayMapper, ProductionCalendarDay> implements ICalendarDayService {
private final CalendarDayMapper calendarDayMapper;
@@ -17,12 +16,12 @@
this.calendarDayMapper = calendarDayMapper;
}
- @Override // org.springblade.modules.cps.service.ICalendarDayService
+ @Override
public void deleteByCalendarId(Long id) {
this.calendarDayMapper.deleteByCalendarId(id, LocalDate.now());
}
- @Override // org.springblade.modules.cps.service.ICalendarDayService
+ @Override
public void saveBatchDay(List<ProductionCalendarDay> productionCalendarDayList) {
saveBatch(productionCalendarDayList);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDaytimeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDaytimeServiceImpl.java
index 0b61431..1456984 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDaytimeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarDaytimeServiceImpl.java
@@ -9,7 +9,6 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/CalendarDaytimeServiceImpl.class */
public class CalendarDaytimeServiceImpl extends ServiceImpl<CalendarDaytimeMapper, ProductionCalendarDaytime> implements ICalendarDaytimeService {
private final CalendarDaytimeMapper calendarDaytimeMapper;
@@ -17,17 +16,17 @@
this.calendarDaytimeMapper = calendarDaytimeMapper;
}
- @Override // org.springblade.modules.cps.service.ICalendarDaytimeService
+ @Override
public void saveBatchDaytime(List<ProductionCalendarDaytime> productionCalendarDaytimeList) {
saveBatch(productionCalendarDaytimeList);
}
- @Override // org.springblade.modules.cps.service.ICalendarDaytimeService
+ @Override
public void deleteByCalendarId(Long id) {
this.calendarDaytimeMapper.deleteByCalendarId(id, LocalDate.now());
}
- @Override // org.springblade.modules.cps.service.ICalendarDaytimeService
+ @Override
public void deleteByCalendarDate(LocalDate localDate, Long calendarId) {
this.calendarDaytimeMapper.deleteByCalendarDate(localDate, calendarId);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
index 62ad700..6533d83 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java
@@ -1,16 +1,5 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -21,7 +10,6 @@
import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
@@ -32,10 +20,27 @@
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+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.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.qianwen.core.log.exception.ServiceException;
+import com.qianwen.core.redis.cache.BladeRedis;
+import com.qianwen.core.secure.utils.AuthUtil;
+import com.qianwen.core.tool.utils.CollectionUtil;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.ParamCache;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.cache.cps.TimeSliceCache;
import com.qianwen.smartman.common.constant.CalendarConstant;
import com.qianwen.smartman.common.constant.CommonConstant;
@@ -44,12 +49,6 @@
import com.qianwen.smartman.common.utils.CommonUtil;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.redis.cache.BladeRedis;
-import com.qianwen.core.secure.utils.AuthUtil;
-import com.qianwen.core.tool.utils.CollectionUtil;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.convert.ProductionCalendarConvert;
import com.qianwen.smartman.modules.cps.dto.CacheBuildDTO;
import com.qianwen.smartman.modules.cps.dto.CalendarCacheDTO;
@@ -92,15 +91,11 @@
import com.qianwen.smartman.modules.cps.vo.ShiftTimeDetailVO;
import com.qianwen.smartman.modules.cps.vo.ShiftVO;
import com.qianwen.smartman.modules.mdc.dto.ShiftIndexNameDTO;
-import org.springframework.beans.BeanUtils;
-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 cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/CalendarServiceImpl.class */
public class CalendarServiceImpl extends ServiceImpl<CalendarMapper, ProductionCalendar> implements ICalendarService {
private static final Logger log = LoggerFactory.getLogger(CalendarServiceImpl.class);
@Autowired
@@ -115,7 +110,7 @@
@Autowired
private BladeRedis bladeRedis;
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public ProductionCalendar saveCalendar(CalendarSaveVO calendarSaveVO) {
checkCalendar(calendarSaveVO, AuthUtil.getTenantId());
@@ -125,7 +120,7 @@
return productionCalendar;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public ProductionCalendar saveYearCalendar(CalendarSaveVO calendarSaveVO) {
checkCalendar(calendarSaveVO, AuthUtil.getTenantId());
ProductionCalendar productionCalendar = new ProductionCalendar();
@@ -135,7 +130,7 @@
return productionCalendar;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public ProductionCalendar updateCalendar(CalendarUpdateVO calendarUpdateVO) {
this.calendarDayService.deleteByCalendarId(calendarUpdateVO.getId());
this.calendarDaytimeService.deleteByCalendarId(calendarUpdateVO.getId());
@@ -150,19 +145,19 @@
Integer year = productionCalendar.getYear();
LocalDate queryStartDay = LocalDate.of(year.intValue(), 1, 1);
Long calendarId = productionCalendar.getId();
- Set<LocalDate> dateList = (Set) dateDTOList.stream().filter(c -> {
+ Set<LocalDate> dateList = dateDTOList.stream().filter(c -> {
return !Func.isNull(c.getModelId()) && Func.isNull(c.getOffDayId());
}).map((v0) -> {
return v0.getCalendarDate();
}).collect(Collectors.toSet());
- Set<LocalDate> offDay = (Set) dateDTOList.stream().filter(c2 -> {
+ Set<LocalDate> offDay = dateDTOList.stream().filter(c2 -> {
return !Func.isNull(c2.getOffDayId());
}).map((v0) -> {
return v0.getCalendarDate();
}).collect(Collectors.toSet());
List<ProductionCalendarDaytime> productionCalendarDaytimeList = new ArrayList<>();
List<ProductionCalendarDay> productionCalendarDayList = new ArrayList<>();
- List<Long> modelIds = (List) dateDTOList.stream().map((v0) -> {
+ List<Long> modelIds = dateDTOList.stream().map((v0) -> {
return v0.getModelId();
}).distinct().collect(Collectors.toList());
Map<Long, ShiftVO> shiftDetailMap = this.shiftModelService.getShiftDetail(modelIds);
@@ -222,7 +217,7 @@
private void buildCalendarOffDay(ProductionCalendarDay productionCalendarDay, Snowflake snowflake, List<ProductionCalendarDay> productionCalendarDayList, ShiftVO shiftDetail, Long calendarId, List<ProductionCalendarDaytime> curProductionCalendarDayTimeList, CalendarDateDTO calendarDateDTO, Integer week, Integer month, Integer year, Integer startDate, Integer endDate) {
productionCalendarDay.setId(Long.valueOf(snowflake.nextId()));
productionCalendarDayList.add(productionCalendarDay);
- List<ShiftDetailVO> collect = (List) shiftDetail.getShiftDetailVOList().stream().sorted(Comparator.comparing((v0) -> {
+ List<ShiftDetailVO> collect = shiftDetail.getShiftDetailVOList().stream().sorted(Comparator.comparing((v0) -> {
return v0.getShiftStartTime();
})).collect(Collectors.toList());
for (int i = 0; i < collect.size(); i++) {
@@ -231,7 +226,7 @@
Integer endTime = shiftDetailVO.getShiftEndTime();
createUndefinedDaytime(calendarId, curProductionCalendarDayTimeList, calendarDateDTO, week, month, year, startDate, endDate, productionCalendarDay, collect, i, startTime, endTime);
if (CollectionUtil.isNotEmpty(shiftDetailVO.getShiftRestTimeVOList())) {
- List<ShiftRestTimeVO> shiftRestTimeVOList = (List) shiftDetailVO.getShiftRestTimeVOList().stream().sorted(Comparator.comparing((v0) -> {
+ List<ShiftRestTimeVO> shiftRestTimeVOList = shiftDetailVO.getShiftRestTimeVOList().stream().sorted(Comparator.comparing((v0) -> {
return v0.getRestStartTime();
})).collect(Collectors.toList());
createShiftDayTime(calendarId, curProductionCalendarDayTimeList, calendarDateDTO, week, month, year, productionCalendarDay, shiftDetailVO, startTime, endTime, shiftRestTimeVOList);
@@ -249,19 +244,19 @@
Long calendarId = calenadar.getId();
Integer year = calenadar.getYear();
Integer currentYear = Integer.valueOf(LocalDate.now().getYear());
- Set<LocalDate> dateList = (Set) dateDTOList.stream().filter(c -> {
+ Set<LocalDate> dateList = dateDTOList.stream().filter(c -> {
return !Func.isNull(c.getModelId()) && Func.isNull(c.getOffDayId());
}).map((v0) -> {
return v0.getCalendarDate();
}).collect(Collectors.toSet());
- Set<LocalDate> offDay = (Set) dateDTOList.stream().filter(c2 -> {
+ Set<LocalDate> offDay = dateDTOList.stream().filter(c2 -> {
return !Func.isNull(c2.getOffDayId());
}).map((v0) -> {
return v0.getCalendarDate();
}).collect(Collectors.toSet());
List<ProductionCalendarDaytime> productionCalendarDaytimeList = new ArrayList<>();
List<ProductionCalendarDay> productionCalendarDayList = new ArrayList<>();
- List<Long> modelIds = (List) dateDTOList.stream().map((v0) -> {
+ List<Long> modelIds = dateDTOList.stream().map((v0) -> {
return v0.getModelId();
}).distinct().collect(Collectors.toList());
Map<Long, ShiftVO> shiftDetailMap = this.shiftModelService.getShiftDetail(modelIds);
@@ -526,7 +521,7 @@
productionCalendarDaytimeList.addAll(curProductionCalendarDayTimeList);
return;
}
- List<ProductionCalendarDaytime> filterList = (List) curProductionCalendarDayTimeList.stream().filter(item -> {
+ List<ProductionCalendarDaytime> filterList = curProductionCalendarDayTimeList.stream().filter(item -> {
return item.getStartTime().isBefore(nextStartTime);
}).sorted(Comparator.comparing((v0) -> {
return v0.getStartTime();
@@ -637,7 +632,7 @@
});
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public CalendarVO getCalendar(Long calendarId) {
CalendarVO calendarDetail = this.baseMapper.getCalendarDetail(calendarId);
List<CalendarDayVO> otherCalendarDayVOList = new ArrayList<>();
@@ -693,7 +688,7 @@
private void entityToVo(List<CalendarDayVO> otherCalendarDayVOList, List<ProductionCalendarDay> list) {
if (Func.isNotEmpty(list)) {
- otherCalendarDayVOList.addAll((Collection) list.stream().map(productionCalendarDay -> {
+ otherCalendarDayVOList.addAll(list.stream().map(productionCalendarDay -> {
CalendarDayVO calendarDayVO = new CalendarDayVO();
BeanUtils.copyProperties(productionCalendarDay, calendarDayVO);
return calendarDayVO;
@@ -701,7 +696,7 @@
}
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public ProductionCalendar copyCalendar(CalendarCopyVO calendarCopyVO) {
CalendarSaveVO calendarSaveVO = new CalendarSaveVO();
@@ -735,19 +730,19 @@
private void saveYearCalendarDayTime(List<CalendarDateDTO> dateDTOList, ProductionCalendar productionCalendar) {
Integer year = productionCalendar.getYear();
Long calendarId = productionCalendar.getId();
- Set<LocalDate> dateList = (Set) dateDTOList.stream().filter(c -> {
+ Set<LocalDate> dateList = dateDTOList.stream().filter(c -> {
return !Func.isNull(c.getModelId()) && Func.isNull(c.getOffDayId());
}).map((v0) -> {
return v0.getCalendarDate();
}).collect(Collectors.toSet());
- Set<LocalDate> offDay = (Set) dateDTOList.stream().filter(c2 -> {
+ Set<LocalDate> offDay = dateDTOList.stream().filter(c2 -> {
return !Func.isNull(c2.getOffDayId());
}).map((v0) -> {
return v0.getCalendarDate();
}).collect(Collectors.toSet());
List<ProductionCalendarDaytime> productionCalendarDaytimeList = new ArrayList<>();
List<ProductionCalendarDay> productionCalendarDayList = new ArrayList<>();
- List<Long> modelIds = (List) dateDTOList.stream().map((v0) -> {
+ List<Long> modelIds = dateDTOList.stream().map((v0) -> {
return v0.getModelId();
}).distinct().collect(Collectors.toList());
Map<Long, ShiftVO> shiftDetailMap = this.shiftModelService.getShiftDetail(modelIds);
@@ -793,7 +788,7 @@
}
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<TimestampToProductionTimeCacheDto> buildProductionTimeCache(CacheBuildDTO cacheBuildDTO) {
LocalDate targetDate = cacheBuildDTO.getTargetDate();
Set<String> tenantIds = cacheBuildDTO.getTenantIds();
@@ -889,7 +884,7 @@
timeSlicesDTOMap.put(Integer.valueOf(i), calendarShiftTimeSlicesDTO);
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<CalendarSimpleVO> getCalendarList(String tenantId) {
return list(Wrappers.<ProductionCalendar>query().lambda()
.eq(ProductionCalendar::getTenantId, tenantId))
@@ -910,7 +905,7 @@
*/
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<CalendarShiftDetailDTO> getDaytimeList(String tenantId, String calendarCode, Integer year) {
List<CalendarShiftDetailDTO> result = new ArrayList<>();
Optional.ofNullable(getOne(new QueryWrapper<ProductionCalendar>().lambda()
@@ -937,7 +932,7 @@
return result;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<CalendarCacheDTO> buildCalendarShift(CacheBuildDTO cacheBuildDTO) {
List<CalendarCacheDTO> calendarCacheDTOList = new LinkedList<>();
LocalDate targetDate = cacheBuildDTO.getTargetDate();
@@ -982,7 +977,7 @@
return calendarCacheDTOList;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<CurShiftDTO> getCurShift(String tenantId, List<String> calendarCodeList) {
List<ProductionCalendar> list = list(new QueryWrapper<ProductionCalendar>().lambda()
.in(ProductionCalendar::getCode, calendarCodeList)
@@ -1028,7 +1023,7 @@
return curShiftDTOS;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public Map<String, FactoryDayInfoDTO> getFactoryDayInfo(LocalDateTime date, String tenantId, List<String> calendarCodeList) {
List<FactoryDayInfoDTO> factoryDayInfoDTOList = new ArrayList<>();
Integer minute = Integer.valueOf((date.getHour() * 60) + date.getMinute());
@@ -1076,7 +1071,7 @@
}).collect(Collectors.toMap(FactoryDayInfoDTO::getCalendarCode, v -> v));
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public ShiftSlicesDTO getShiftSlices(ShiftSlicesClientDTO shiftSlicesClientDTO) {
String tenantId = shiftSlicesClientDTO.getTenantId();
String calendarCode = shiftSlicesClientDTO.getCalendarCode();
@@ -1094,7 +1089,7 @@
return shiftSlicesDTO;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<ShiftSlicesCalendarCodeDTO> getShiftSlicesList(ShiftSlicesClientCalendarCodesDTO shiftSlicesClientCalendarCodesDTO) {
List<String> calendarCodes = shiftSlicesClientCalendarCodesDTO.getCalendarCodes();
ArrayList<ShiftSlicesCalendarCodeDTO> shiftSlicesCalendarCodeDTOList = new ArrayList<>();
@@ -1114,7 +1109,7 @@
return shiftSlicesCalendarCodeDTOList;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public Long getShiftTimeWithoutRest(String calendarCode) {
ProductionCalendar productionCalendar = getOne(Wrappers.<ProductionCalendar>lambdaQuery()
.eq(ProductionCalendar::getCode, calendarCode)
@@ -1149,17 +1144,17 @@
}).sum());
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public ShiftIndexNameVO getShiftIndexName() {
return this.shiftModelService.getShiftIndexName();
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public String getShiftIndexNameByCodeAndYear(String calendarCode, CalendarShiftTimeSlicesDTO calendarShiftTimeSlicesDTO) {
return this.baseMapper.getShiftIndexNameByCodeAndYear(calendarCode, calendarShiftTimeSlicesDTO.getFactoryYear(), calendarShiftTimeSlicesDTO.getFactoryDate(), calendarShiftTimeSlicesDTO.getShiftIndex(), AuthUtil.getTenantId());
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public String expireCalendarInfo() {
String code = this.baseMapper.expireCalendarInfo(LocalDate.now().getYear());
LocalDate now = LocalDate.now();
@@ -1172,7 +1167,7 @@
return null;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteCalendar(Long id) {
//Workstation::getCalendarCodeWaiting
@@ -1190,12 +1185,12 @@
return true;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public Long getShiftModelByFactoryDay(String calendarCode, LocalDate factoryDay) {
return this.baseMapper.getShiftModelByFactoryDay(calendarCode, Integer.valueOf(LocalDate.now().getYear()), factoryDay);
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<ShiftTimeDetailVO> getShiftDetailDates(String calendarCode, List<LocalDate> dates) {
//ProductionCalendar
@@ -1212,7 +1207,7 @@
})).orderByAsc("calendar_date", new String[]{"shift_index"}));*/
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<CalendarShiftDTO> getTimeShiftAll(String calendarCode, Date startTime, Date endTime) {
QueryWrapper<Object> wrapper = Wrappers.query().eq("bpc.is_deleted", 0)
@@ -1232,7 +1227,7 @@
*/
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<ShiftIndexInfoDTO> getWorkstationShiftIndexListByDate(Long workstationId, LocalDate localDate) {
List<ShiftIndexInfoDTO> result = Lists.newArrayList();
@@ -1287,7 +1282,7 @@
return workstationShiftIndexListByDate;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public Boolean associateWorkstation(CalendarAssociateWorkstationVO calendarAssociateWorkstationVO) {
return this.workstationService.update(Wrappers.<Workstation>lambdaUpdate()
.set(Workstation::getCalendarCodeWaiting, calendarAssociateWorkstationVO.getCalendarCode())
@@ -1300,7 +1295,7 @@
}, calendarAssociateWorkstationVO.getWorkstationIdList())));*/
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<ShiftIndexNameDTO> queryShiftIndexName(String calendarCode, Integer year, String day) {
Integer maxShiftIndex;
List<ShiftIndexNameDTO> shiftIndexNameDTOList = this.baseMapper.queryShiftIndexName(calendarCode, year, day);
@@ -1317,7 +1312,7 @@
return shiftIndexNameDTOList;
}
- @Override // org.springblade.modules.cps.service.ICalendarService
+ @Override
public List<ShiftInfoDTO> listShiftInfo(List<Long> workstationIdList, LocalDate startDay, LocalDate endDay) {
Integer maxShiftIndex;
List<ShiftInfoDTO> shiftInfoDTOList = this.baseMapper.listShiftInfo(workstationIdList, startDay, endDay);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckItemServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckItemServiceImpl.java
index 864ddbe..af60e56 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckItemServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckItemServiceImpl.java
@@ -1,19 +1,17 @@
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.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.CheckItemConvert;
import com.qianwen.smartman.modules.cps.dto.CheckItemSubmitDTO;
import com.qianwen.smartman.modules.cps.entity.CheckItem;
@@ -22,16 +20,15 @@
import com.qianwen.smartman.modules.cps.vo.CheckItemSubmitVO;
import com.qianwen.smartman.modules.cps.vo.CheckItemUpdateVO;
import com.qianwen.smartman.modules.cps.vo.CheckItemVO;
-import org.springframework.stereotype.Service;
@Service
public class CheckItemServiceImpl extends BladeServiceImpl<CheckItemMapper, CheckItem> implements ICheckItemService {
- @Override // org.springblade.modules.cps.service.ICheckItemService
+ @Override
public List<CheckItem> createCheckItem(CheckItemSubmitVO vo) {
List<CheckItemSubmitDTO> items = vo.getItems();
- List<String> names = (List) items.stream().map((v0) -> {
+ List<String> names = items.stream().map((v0) -> {
return v0.getName();
}).distinct().collect(Collectors.toList());
if (items.size() != names.size()) {
@@ -39,14 +36,14 @@
}
Long checkProjectId = vo.getCheckProjectId();
createNotSameName(checkProjectId, names);
- List<CheckItem> checkItems = (List) items.stream().map(c -> {
+ List<CheckItem> checkItems = items.stream().map(c -> {
return CheckItem.builder().checkProjectId(checkProjectId).name(c.getName()).valueType(c.getValueType()).standardValue(c.getStandardValue()).requirement(c.getRequirement()).build();
}).collect(Collectors.toList());
saveBatch(checkItems);
return checkItems;
}
- @Override // org.springblade.modules.cps.service.ICheckItemService
+ @Override
public boolean updateCheckItem(CheckItemUpdateVO vo) {
Long id = vo.getId();
String valueType = vo.getValueType();
@@ -64,51 +61,21 @@
.set(CheckItem::getStandardValue, standardValue)
.set(CheckItem::getName, name)
.eq(CheckItem::getId, id));
- /*
- return update((Wrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
- return v0.getValueType();
- }, valueType)).set((v0) -> {
- return v0.getRequirement();
- }, requirement)).set((v0) -> {
- return v0.getStandardValue();
- }, standardValue)).set((v0) -> {
- return v0.getName();
- }, name)).eq((v0) -> {
- return v0.getId();
- }, id));*/
}
- @Override // org.springblade.modules.cps.service.ICheckItemService
+ @Override
public List<CheckItemVO> listCheckItem(String projectId) {
List<CheckItem> list = list(Wrappers.<CheckItem>lambdaQuery().eq(CheckItem::getCheckProjectId, projectId).orderByAsc(CheckItem::getCreateTime));
return Optional.<List<CheckItem>>ofNullable(list)
.map(CheckItemConvert.INSTANCE::convert)
.orElse(new ArrayList<>());
- /*
- *
- List<CheckItem> list = list((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCheckProjectId();
- }, projectId)).orderByAsc((v0) -> {
- return v0.getCreateTime();
- }));
- Optional ofNullable = Optional.ofNullable(list);
- CheckItemConvert checkItemConvert = CheckItemConvert.INSTANCE;
- checkItemConvert.getClass();
- return (List) ofNullable.map(this::convert).orElse(new ArrayList());
- */
+
}
private void validSameName(Long checkProjectId, Long id, String name) {
long count = count(Wrappers.<CheckItem>lambdaQuery().eq(CheckItem::getCheckProjectId, checkProjectId).ne(CheckItem::getId, id).eq(CheckItem::getName, name));
- /*
- long count = count((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
- return v0.getCheckProjectId();
- }, checkProjectId)).ne((v0) -> {
- return v0.getId();
- }, id)).eq((v0) -> {
- return v0.getName();
- }, name));*/
+
if (count > 0) {
throw new ServiceException(MessageUtils.message("cps.tpm.check.item.exists", new Object[0]));
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckProjectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckProjectServiceImpl.java
index 1906ffb..1cee35c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckProjectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CheckProjectServiceImpl.java
@@ -1,16 +1,5 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
-import com.alibaba.fastjson.JSON;
-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.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
@@ -19,15 +8,20 @@
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.DateConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.enums.StatusType;
-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.alibaba.fastjson.JSON;
+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.excel.util.ExcelUtil;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
@@ -37,6 +31,12 @@
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.tool.utils.StringUtil;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.DateConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.enums.StatusType;
+import com.qianwen.smartman.common.utils.MessageUtils;
+import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.modules.cps.convert.CheckProjectConvert;
import com.qianwen.smartman.modules.cps.entity.CheckItem;
import com.qianwen.smartman.modules.cps.entity.CheckProject;
@@ -52,12 +52,8 @@
import com.qianwen.smartman.modules.cps.vo.CheckProjectUpdateVO;
import com.qianwen.smartman.modules.cps.vo.CheckProjectVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/CheckProjectServiceImpl.class */
public class CheckProjectServiceImpl extends BladeServiceImpl<CheckProjectMapper, CheckProject> implements ICheckProjectService {
private static final Logger log = LoggerFactory.getLogger(CheckProjectServiceImpl.class);
private final ICheckItemService checkItemService;
@@ -71,17 +67,11 @@
this.checkService = checkService;
}
- @Override // org.springblade.modules.cps.service.ICheckProjectService
+ @Override
public CheckProject createCheckProject(CheckProjectSubmitVO vo) {
String code = vo.getCode();
long count = count(Wrappers.<CheckProject>lambdaQuery().eq(Func.isNotBlank(code), CheckProject::getCode, code).eq(CheckProject::getStatus, CommonConstant.ENABLE));
- /*
- long count = count((Wrapper) Wrappers.lambdaQuery().eq(Func.isNotBlank(code), (v0) -> {
- return v0.getCode();
- }, code).eq((v0) -> {
- return v0.getStatus();
- }, CommonConstant.ENABLE));
- */
+
if (count > 0) {
throw new ServiceException(MessageUtils.message("excel.import.check.project.code.same", new Object[0]));
}
@@ -95,9 +85,9 @@
return checkProject;
}
- @Override // org.springblade.modules.cps.service.ICheckProjectService
+ @Override
public IPage<CheckProjectVO> pageCheckProject(Query query, String key, Integer status) {
- IPage<CheckProject> page1 = page(Condition.getPage(query));
+ //IPage<CheckProject> page1 = page(Condition.getPage(query));
IPage<CheckProject> page = page(Condition.getPage(query), Wrappers.<CheckProject>lambdaQuery()
.eq(CheckProject::getStatus, (status == null) ? CommonConstant.ENABLE : status)
.and(Func.isNotBlank(key), c -> c.likeRight(CheckProject::getCode, key))
@@ -127,7 +117,7 @@
}).orElse(new Page<>());
}
- @Override // org.springblade.modules.cps.service.ICheckProjectService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public boolean removeCheckProject(List<String> ids, Integer type) {
if (StatusType.REMOVE.getType().equals(type)) {
@@ -147,13 +137,13 @@
return changeStatus(Func.toLongList(ids), CommonConstant.DEACTIVATE);
}
- @Override // org.springblade.modules.cps.service.ICheckProjectService
+ @Override
public boolean updateCheckProject(CheckProjectUpdateVO vo) {
CheckProject checkProject = CheckProjectConvert.INSTANCE.convert(vo);
return updateById(checkProject);
}
- @Override // org.springblade.modules.cps.service.ICheckProjectService
+ @Override
public BladeFile exportCheckProject(String key, Integer status) {
List<CheckProject> checkProjects = list(
@@ -218,7 +208,7 @@
return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
}
- @Override // org.springblade.modules.cps.service.ICheckProjectService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public BladeFile importCheckProject(MultipartFile file) {
List<CheckProjectImport> rawData = ExcelUtil.read(file, 0, 2, CheckProjectImport.class);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupOfItemServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupOfItemServiceImpl.java
index fa9ee76..a8a5ba6 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupOfItemServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupOfItemServiceImpl.java
@@ -7,6 +7,5 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/CommonGroupOfItemServiceImpl.class */
public class CommonGroupOfItemServiceImpl extends ServiceImpl<CommonGroupOfItemMapper, CommonGroupOfItem> implements ICommonGroupOfItemService {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java
index 9993151..2e150c2 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CommonGroupServiceImpl.java
@@ -68,7 +68,6 @@
import com.qianwen.smartman.modules.system.service.IParamBizService;
@Service
-
public class CommonGroupServiceImpl extends ServiceImpl<CommonGroupMapper, CommonGroup> implements ICommonGroupService {
private static final String PARENT_ID = "parentId";
private static final String ROOT_NODE_CONFIGURE_ERROR = "The root node is not configured or configured incorrectly";
@@ -97,12 +96,7 @@
return update(Wrappers.<CommonGroup>lambdaUpdate()
.set(CommonGroup::getStatus, status)
.in(CommonGroup::getId, ids));
- /*
- return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
- return v0.getStatus();
- }, status)).in((v0) -> {
- return v0.getId();
- }, ids)));*/
+
}
@Override
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java
index 49a12ed..581209c 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftRoutingServiceImpl.java
@@ -1,26 +1,26 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-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.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.qianwen.smartman.common.cache.RegionCache;
-import com.qianwen.smartman.common.constant.CraftConstant;
-import com.qianwen.smartman.common.utils.MessageUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
import com.qianwen.core.tool.support.Kv;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.tool.utils.RandomType;
import com.qianwen.core.tool.utils.StringUtil;
+import com.qianwen.smartman.common.constant.CraftConstant;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.convert.CraftRoutingConvert;
import com.qianwen.smartman.modules.cps.convert.ProductConvert;
import com.qianwen.smartman.modules.cps.convert.ProductionCraftProcessConvert;
@@ -61,11 +61,11 @@
import com.qianwen.smartman.modules.cps.vo.VersionProcessAddVO;
import com.qianwen.smartman.modules.system.service.IBasCoderuleService;
import com.qianwen.smartman.modules.tpm.enums.MetaTypeEnum;
-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/CraftRoutingServiceImpl.class */
public class CraftRoutingServiceImpl extends BladeServiceImpl<CraftRoutingMapper, CraftRouting> implements ICraftRoutingService {
private static final Logger log = LoggerFactory.getLogger(CraftRoutingServiceImpl.class);
private final IProductionCraftVersionService craftVersionService;
@@ -89,19 +89,19 @@
this.basCodeRuleService = basCodeRuleService;
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public CraftRoutingVO saveRouting(CraftRoutingAddVO vo) {
CraftRouting craftRouting = saveCraftRouting(vo);
return CraftRoutingConvert.INSTANCE.convert(craftRouting);
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public List<CraftRoutingVO> listCraftRouting(SearchVO vo) {
Wrapper<CraftRouting> wrapper = getWrapper(vo);
return this.baseMapper.listCraftRouting(Func.isBlank(wrapper.getSqlSegment()) ? null : wrapper);
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public CraftRoutingDetailVO detailCraft(Long id) {
CraftRoutingDetailVO vo = new CraftRoutingDetailVO();
setProduce(vo, id);
@@ -109,13 +109,14 @@
return vo;
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean deleteCraft(Long id) {
boolean flag = removeById(id);
// .select(new SFunction[] { ProductionCraftVersion::getId })
- List<Long> versionIds = this.craftVersionService.listObjs(Wrappers.<ProductionCraftVersion>lambdaQuery(ProductionCraftVersion.class)
+
+ List<Long> versionIds = this.craftVersionService.listObjs(Wrappers.<ProductionCraftVersion>lambdaQuery()
.select(ProductionCraftVersion::getId)
.eq(ProductionCraftVersion::getCraftId, id), c -> Long.valueOf((c instanceof BigDecimal) ? ((BigDecimal)c).longValue() : ((Long)c).longValue()));
/*
@@ -132,21 +133,19 @@
return Boolean.valueOf(flag && this.versionLineService.remove(Wrappers.<CraftVersionLine>lambdaQuery().eq(CraftVersionLine::getCraftId, id)));
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public Boolean updateCraft(CraftRoutingUpdateVO vo) {
validNameExist(vo.getId(), vo.getName());
CraftRouting routing = CraftRoutingConvert.INSTANCE.convert(vo);
return Boolean.valueOf(updateById(routing));
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean copyCraftVersion(ProductionCraftVersionCopyVO vo) {
Integer type = vo.getType();
if (CraftConstant.COPY_TYPE_PRODUCT.equals(type)) {
- CraftRouting routing = (CraftRouting) getOne((Wrapper) Wrappers.lambdaQuery(CraftRouting.class).eq((v0) -> {
- return v0.getProductId();
- }, vo.getProductId()));
+ CraftRouting routing = getOne(Wrappers.lambdaQuery(CraftRouting.class).eq(CraftRouting::getProductId, vo.getProductId()));
if (Func.isNull(routing)) {
return Boolean.valueOf(copyProductNewCraft(vo));
}
@@ -155,46 +154,40 @@
return Boolean.valueOf(copyCraftNewVersion(vo, vo.getCraftId()));
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public List<ProductionCraftVersionVO> listFixedVersionByProduction(Long productionId) {
- CraftRouting craft = (CraftRouting) getOne((Wrapper) Wrappers.lambdaQuery(CraftRouting.class).eq((v0) -> {
- return v0.getProductId();
- }, productionId));
+ CraftRouting craft = getOne(Wrappers.lambdaQuery(CraftRouting.class).eq(CraftRouting::getProductId, productionId));
if (Func.isNull(craft)) {
return Lists.newArrayList();
}
return this.craftVersionService.listFixed(craft.getId());
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public CraftRoutingDetailVO getCraftByProduction(Long production) {
- CraftRouting craft = (CraftRouting) getOne((Wrapper) Wrappers.lambdaQuery(CraftRouting.class).eq((v0) -> {
- return v0.getProductId();
- }, production));
+ CraftRouting craft = getOne(Wrappers.lambdaQuery(CraftRouting.class).eq(CraftRouting::getProductId, production));
if (Func.isNull(craft)) {
return null;
}
return detailCraft(craft.getId());
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public List<CraftRoutingVO> listNotBandCraft() {
- return CraftRoutingConvert.INSTANCE.convert(list((Wrapper) Wrappers.lambdaQuery(CraftRouting.class).isNull((v0) -> {
- return v0.getProductId();
- })));
+ return CraftRoutingConvert.INSTANCE.convert(list(Wrappers.lambdaQuery(CraftRouting.class).isNull(CraftRouting::getProductId)));
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public Boolean craftBindProduction(Long productionId, Long craftId) {
return update(Wrappers.lambdaUpdate(CraftRouting.class).set(CraftRouting::getProductId, productionId).eq(CraftRouting::getId, craftId));
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public Boolean craftUnbindProduction(Long craftId) {
return update(Wrappers.lambdaUpdate(CraftRouting.class).set(CraftRouting::getProductId, null).eq(CraftRouting::getId, craftId));
}
- @Override // org.springblade.modules.cps.service.ICraftRoutingService
+ @Override
public List<ProductVO> notBandProduct(Long craftId) {
List<Product> products = this.productService.notBandProduct(craftId);
return ProductConvert.INSTANCE.convert(products);
@@ -251,22 +244,22 @@
}, processIds)).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getVersionProcessId();
}));
- Map<Long, List<ProductionCraftProcessRelatedTool>> processToolMap = (Map) this.relatedToolService.list(Wrappers.lambdaQuery(ProductionCraftProcessRelatedTool.class).in((v0) -> {
+ Map<Long, List<ProductionCraftProcessRelatedTool>> processToolMap = this.relatedToolService.list(Wrappers.lambdaQuery(ProductionCraftProcessRelatedTool.class).in((v0) -> {
return v0.getVersionProcessId();
}, processIds)).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getVersionProcessId();
}));
- Map<Long, List<ProductionCraftProcessFile>> processFileMap = (Map) this.processFileService.list(Wrappers.lambdaQuery(ProductionCraftProcessFile.class).in((v0) -> {
+ Map<Long, List<ProductionCraftProcessFile>> processFileMap = this.processFileService.list(Wrappers.lambdaQuery(ProductionCraftProcessFile.class).in((v0) -> {
return v0.getVersionProcessId();
}, processIds)).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getVersionProcessId();
}));
- List<VersionProcessAddVO> collect = (List) processList.stream().filter(c -> {
+ List<VersionProcessAddVO> collect = processList.stream().filter(c -> {
return Func.isNull(c.getMainSequenceId()) && Func.notNull(c.getProcessId());
}).map(process -> {
return getVersionProcessAddVO(processFixtureMap, processToolMap, processFileMap, process);
}).collect(Collectors.toList());
- List<ProductionCraftProcess> list = (List) processList.stream().filter(c2 -> {
+ List<ProductionCraftProcess> list = processList.stream().filter(c2 -> {
return Func.notNull(c2.getMainSequenceId()) || Func.isNull(c2.getProcessId());
}).collect(Collectors.toList());
List<ParallelProVO> parallelProcessList = Lists.newArrayList();
@@ -282,7 +275,7 @@
proVO.setXCoordinate(l12.getXCoordinate());
proVO.setYCoordinate(l12.getYCoordinate());
proVO.setHeight(l12.getHeight());
- List<VersionProcessAddVO> vos = (List) list.stream().filter(l2 -> {
+ List<VersionProcessAddVO> vos = list.stream().filter(l2 -> {
return l12.getId().equals(l2.getMainSequenceId());
}).map(process2 -> {
return getVersionProcessAddVO(processFixtureMap, processToolMap, processFileMap, process2);
@@ -302,21 +295,21 @@
VersionProcessAddVO processAddVO = ProductionCraftProcessConvert.INSTANCE.convertAdd(process);
List<ProductionCraftProcessRelatedFixture> fixtures = processFixtureMap.get(process.getId());
if (Func.isNotEmpty(fixtures)) {
- List<ProductionCraftProcessRelatedFixtureVO> fixtureAddList = (List) fixtures.stream().map(c -> {
+ List<ProductionCraftProcessRelatedFixtureVO> fixtureAddList = fixtures.stream().map(c -> {
return new ProductionCraftProcessRelatedFixtureVO().setFixtureId(c.getFixtureId()).setVersionProcessId(c.getVersionProcessId()).setFixtureCode(c.getFixtureCode()).setFixtureName(c.getFixtureName()).setFixtureGroupName(c.getFixtureGroupName());
}).collect(Collectors.toList());
processAddVO.setFixtures(fixtureAddList);
}
List<ProductionCraftProcessFile> files = processFileMap.get(process.getId());
if (Func.isNotEmpty(files)) {
- List<ProductionCraftProcessFileVO> fileAddList = (List) files.stream().map(c2 -> {
+ List<ProductionCraftProcessFileVO> fileAddList = files.stream().map(c2 -> {
return new ProductionCraftProcessFileVO().setFileName(c2.getFileName()).setObjectKey(c2.getObjectKey()).setContentType(c2.getContentType()).setLink(c2.getLink()).setFileSize(c2.getFileSize()).setUploadTime(c2.getUploadTime()).setVersionProcessId(c2.getVersionProcessId());
}).collect(Collectors.toList());
processAddVO.setFiles(fileAddList);
}
List<ProductionCraftProcessRelatedTool> tools = processToolMap.get(process.getId());
if (Func.isNotEmpty(tools)) {
- List<ProductionCraftProcessRelatedToolVO> toolAddList = (List) tools.stream().map(c3 -> {
+ List<ProductionCraftProcessRelatedToolVO> toolAddList = tools.stream().map(c3 -> {
return new ProductionCraftProcessRelatedToolVO().setToolId(c3.getToolId()).setVersionProcessId(c3.getVersionProcessId()).setToolCode(c3.getToolCode()).setToolCategoryName(c3.getToolCategoryName()).setToolModelName(c3.getToolModelName());
}).collect(Collectors.toList());
processAddVO.setTools(toolAddList);
@@ -402,11 +395,7 @@
}
private void validNameExist(Long id, String name) {
- long count = count((Wrapper) Wrappers.lambdaQuery(CraftRouting.class).ne(Func.isNotEmpty(id), (v0) -> {
- return v0.getId();
- }, id).eq((v0) -> {
- return v0.getName();
- }, name));
+ long count = count(Wrappers.lambdaQuery(CraftRouting.class).ne(Func.isNotEmpty(id), CraftRouting::getId, id).eq(CraftRouting::getName, name));
ThrowFun.isTrue(count > 0).throwMessage(MessageUtils.message("cps.craft.name.exist", new Object[0]));
}
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftVersionLineServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftVersionLineServiceImpl.java
index e9911d1..a36984f 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftVersionLineServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CraftVersionLineServiceImpl.java
@@ -8,9 +8,8 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/CraftVersionLineServiceImpl.class */
public class CraftVersionLineServiceImpl extends BladeServiceImpl<CraftVersionLineMapper, CraftVersionLine> implements ICraftVersionLineService {
- @Override // org.springblade.modules.cps.service.ICraftVersionLineService
+ @Override
public VersionLineDTO getVersionLine(Long id) {
return this.baseMapper.getVersionLine(id);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java
index 7902e76..8a96968 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceCheckServiceImpl.java
@@ -1,30 +1,28 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.service.impl.BladeServiceImpl;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.cps.entity.DeviceTypeCheckProject;
import com.qianwen.smartman.modules.cps.mapper.DeviceTypeCheckProjectMapper;
import com.qianwen.smartman.modules.cps.service.IDeviceCheckService;
import com.qianwen.smartman.modules.cps.vo.DeviceCheckSubmitVO;
import com.qianwen.smartman.modules.cps.vo.DeviceTypeCheckProjectVO;
-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/DeviceCheckServiceImpl.class */
public class DeviceCheckServiceImpl extends BladeServiceImpl<DeviceTypeCheckProjectMapper, DeviceTypeCheckProject> implements IDeviceCheckService {
- @Override // org.springblade.modules.cps.service.IDeviceCheckService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public List<DeviceTypeCheckProject> createDeviceCheck(DeviceCheckSubmitVO vo) {
List<Long> checkProjectId = vo.getCheckProjectId();
@@ -55,7 +53,7 @@
return collect;
}
- @Override // org.springblade.modules.cps.service.IDeviceCheckService
+ @Override
public List<DeviceTypeCheckProjectVO> listDeviceCheck(Long id) {
return this.baseMapper.listDeviceCheck(id);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
index e64fa09..3590997 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DeviceTypeServiceImpl.java
@@ -1,27 +1,20 @@
package com.qianwen.smartman.modules.cps.service.impl;
-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.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
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.constant.CommonConstant;
-import com.qianwen.smartman.common.constant.ExcelConstant;
-import com.qianwen.smartman.common.enums.StatusType;
-import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.smartman.common.utils.ValidatorUtils;
+
+import org.springframework.stereotype.Service;
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.service.impl.BladeServiceImpl;
@@ -32,6 +25,11 @@
import com.qianwen.core.tool.utils.CollectionUtil;
import com.qianwen.core.tool.utils.DateUtil;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.constant.ExcelConstant;
+import com.qianwen.smartman.common.enums.StatusType;
+import com.qianwen.smartman.common.utils.MessageUtils;
+import com.qianwen.smartman.common.utils.ValidatorUtils;
import com.qianwen.smartman.modules.cps.convert.DeviceTypeConvert;
import com.qianwen.smartman.modules.cps.entity.DeviceType;
import com.qianwen.smartman.modules.cps.entity.Machine;
@@ -44,11 +42,8 @@
import com.qianwen.smartman.modules.cps.vo.DeviceTypeUpdateVO;
import com.qianwen.smartman.modules.cps.vo.DeviceTypeVO;
import com.qianwen.smartman.modules.resource.builder.oss.OssBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/DeviceTypeServiceImpl.class */
public class DeviceTypeServiceImpl extends BladeServiceImpl<DeviceTypeMapper, DeviceType> implements IDeviceTypeService {
private final OssBuilder ossBuilder;
private final IMachineService machineService;
@@ -58,7 +53,7 @@
this.machineService = machineService;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public DeviceType createDeviceType(DeviceTypeAddVO deviceTypeAddVO) {
//DeviceType d;d.getTenantId()
Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery()
@@ -94,7 +89,7 @@
return false;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public DeviceType updateDeviceType(DeviceTypeUpdateVO deviceTypeUpdateVO) {
Long count = Long.valueOf(count(Wrappers.<DeviceType>lambdaQuery()
.eq(DeviceType::getCode, checkExistDeviceType(deviceTypeUpdateVO.getId()).getCode())
@@ -121,7 +116,7 @@
return deviceType;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public IPage<DeviceTypeVO> pageDeviceType(String keyWord, Integer status, Query query) {
//DeviceType::getTenantId DeviceType::getName
IPage<DeviceType> page = page(Condition.getPage(query), Wrappers.<DeviceType>lambdaUpdate()
@@ -155,13 +150,13 @@
}).orElse(new Page<>());
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public DeviceTypeVO getDeviceTypeById(Long id) {
DeviceType deviceType = checkExistDeviceType(id);
return DeviceTypeConvert.INSTANCE.convert(deviceType);
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public Boolean deleteDeviceTypeByIds(List<Long> ids, Integer type) {
List<Machine> machineList = this.machineService.list(Wrappers.<Machine>lambdaQuery().in(Machine::getMachineTypeId, ids));
@@ -181,7 +176,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public List<DeviceTypeExcel> listDeviceType(String keyword, Integer status) {
List<DeviceType> deviceTypes = list(Wrappers.<DeviceType>lambdaQuery()
.eq((status != null), DeviceType::getStatus, status)
@@ -206,7 +201,7 @@
return list;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public BladeFile importDeviceType(List<DeviceTypeExcel> data) {
if (Func.isEmpty(data)) {
throw new ServiceException(MessageUtils.message("excel.import.data.can.not.be.null", new Object[0]));
@@ -268,14 +263,14 @@
return null;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public List<DeviceTypeVO> getDeviceTypeAllList() {
List<DeviceType> list = list();
List<DeviceTypeVO> result = DeviceTypeConvert.INSTANCE.convert(list);
return result;
}
- @Override // org.springblade.modules.cps.service.IDeviceTypeService
+ @Override
public BladeFile export(DeviceTypeExcelVO deviceTypeExcelVO) {
List<DeviceTypeExcel> list = listDeviceType(deviceTypeExcelVO.getKeyWord(), deviceTypeExcelVO.getStatus());
String fileName = String.format("%s-%s.xlsx", "鏈哄櫒绫诲瀷鏁版嵁", DateUtil.time());
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
index 9e18cb2..ac38ff3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/DmpVariablesServiceImpl.java
@@ -1,12 +1,13 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.lang.invoke.SerializedLambda;
-import java.util.List;
-import com.qianwen.smartman.common.enums.WorkstationParamTypeEnum;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.enums.WorkstationParamTypeEnum;
import com.qianwen.smartman.modules.cps.convert.DmpVariablesConvert;
import com.qianwen.smartman.modules.cps.entity.DmpVariables;
import com.qianwen.smartman.modules.cps.entity.Machine;
@@ -18,10 +19,8 @@
import com.qianwen.smartman.modules.cps.vo.DmpStatusVariableVO;
import com.qianwen.smartman.modules.cps.vo.DmpVariablesVO;
import com.qianwen.smartman.modules.cps.vo.MachineDmpVariablesVO;
-import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/DmpVariablesServiceImpl.class */
public class DmpVariablesServiceImpl extends ServiceImpl<DmpVariablesMapper, DmpVariables> implements IDmpVariablesService {
private final IWorkstationOfMachineService workstationOfMachineService;
private final IMachineService machineService;
@@ -32,13 +31,13 @@
this.machineService = machineService;
}
- @Override // org.springblade.modules.cps.service.IDmpVariablesService
+ @Override
public List<DmpVariablesVO> listByMachineId(Long machineId) {
List<DmpVariables> list = list(Wrappers.<DmpVariables>lambdaQuery().eq(DmpVariables::getMachineId, machineId));
return DmpVariablesConvert.INSTANCE.convert(list);
}
- @Override // org.springblade.modules.cps.service.IDmpVariablesService
+ @Override
public MachineDmpVariablesVO listByWorkstationId(Long workstationId) {
WorkstationOfMachine workstationOfMachine = this.workstationOfMachineService.getWorkstationOfMachineByWorkstationId(workstationId);
if (Func.isNotEmpty(workstationOfMachine)) {
@@ -64,17 +63,17 @@
return new MachineDmpVariablesVO();
}
- @Override // org.springblade.modules.cps.service.IDmpVariablesService
+ @Override
public List<DmpVariablesVO> getDmpVariablesByWorkstationId(Long workstationId) {
return ((DmpVariablesMapper) this.baseMapper).getDmpVariablesByWorkstationId(workstationId);
}
- @Override // org.springblade.modules.cps.service.IDmpVariablesService
+ @Override
public List<DmpStatusVariableVO> getDmpVariablesByWorkstationIdList(List<Long> workstationIdList) {
return ((DmpVariablesMapper) this.baseMapper).getDmpVariablesByWorkstationIdList(workstationIdList);
}
- @Override // org.springblade.modules.cps.service.IDmpVariablesService
+ @Override
public List<DmpVariablesVO> getDmpVariablesByWorkstationIds(List<Long> workstationIds) {
return ((DmpVariablesMapper) this.baseMapper).getDmpVariablesByWorkstationIds(workstationIds);
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeePostServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeePostServiceImpl.java
index 2768b1d..43ba233 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeePostServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeePostServiceImpl.java
@@ -7,6 +7,5 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/EmployeePostServiceImpl.class */
public class EmployeePostServiceImpl extends ServiceImpl<EmployeePostMapper, EmployeePost> implements IEmployeePostService {
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
index 25c3f55..ec76d5e 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EmployeeServiceImpl.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.Lists;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -18,10 +8,27 @@
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+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.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.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;
+import com.qianwen.core.oss.model.BladeFile;
+import com.qianwen.core.secure.utils.AuthUtil;
+import com.qianwen.core.tool.utils.DateUtil;
+import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.common.cache.DictCache;
-import com.qianwen.smartman.common.cache.RegionCache;
import com.qianwen.smartman.common.cache.SysCache;
import com.qianwen.smartman.common.constant.CommonConstant;
import com.qianwen.smartman.common.constant.CommonGroupConstant;
@@ -30,18 +37,10 @@
import com.qianwen.smartman.common.enums.CommonGroupTypeEnum;
import com.qianwen.smartman.common.enums.DictEnum;
import com.qianwen.smartman.common.enums.StatusType;
-import com.qianwen.smartman.common.utils.ExtraLambdaQueryWrapper;
import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.common.utils.TreeUtils;
import com.qianwen.smartman.common.utils.ValidatorUtils;
-import com.qianwen.core.excel.util.ExcelUtil;
-import com.qianwen.core.log.exception.ServiceException;
-import com.qianwen.core.mp.base.BaseServiceImpl;
-import com.qianwen.core.oss.model.BladeFile;
-import com.qianwen.core.secure.utils.AuthUtil;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.convert.EmployeeConvert;
import com.qianwen.smartman.modules.cps.dto.EmployeeDTO;
import com.qianwen.smartman.modules.cps.dto.EmployeeNameDTO;
@@ -67,12 +66,10 @@
import com.qianwen.smartman.modules.system.entity.Post;
import com.qianwen.smartman.modules.system.service.ICodeGeneratorService;
import com.qianwen.smartman.modules.system.service.IPostService;
-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 EmployeeServiceImpl extends BaseServiceImpl<EmployeeMapper, Employee> implements IEmployeeService {
private static final Logger log = LoggerFactory.getLogger(EmployeeServiceImpl.class);
private final ICommonGroupService commonGroupService;
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java
index 7044012..56aef32 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/EnterpriseInformationServiceImpl.java
@@ -1,12 +1,11 @@
package com.qianwen.smartman.modules.cps.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.util.ArrayList;
import java.util.List;
-import com.qianwen.smartman.common.cache.RegionCache;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.entity.EnterpriseInformation;
@@ -15,14 +14,12 @@
import com.qianwen.smartman.modules.cps.vo.EnterpriseInVO;
import com.qianwen.smartman.modules.cps.vo.EnterpriseInformationVO;
import com.qianwen.smartman.modules.cps.vo.EnterprisePictureVO;
-import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/EnterpriseInformationServiceImpl.class */
public class EnterpriseInformationServiceImpl extends BaseServiceImpl<EnterpriseInformationMapper, EnterpriseInformation> implements IEnterpriseInformationService {
- @Override // org.springblade.modules.cps.service.IEnterpriseInformationService
+ @Override
public Boolean editEnterprise(EnterpriseInVO enterpriseInformation) {
return Boolean.valueOf(update(Wrappers.<EnterpriseInformation>lambdaUpdate()
.eq(EnterpriseInformation::getId, enterpriseInformation.getId())
@@ -34,7 +31,7 @@
}
- @Override // org.springblade.modules.cps.service.IEnterpriseInformationService
+ @Override
public EnterpriseInformationVO getEnterprise() {
List<EnterpriseInformation> list = list();
EnterpriseInformationVO enterpriseInformationVO = new EnterpriseInformationVO();
@@ -49,12 +46,12 @@
return enterpriseInformationVO;
}
- @Override // org.springblade.modules.cps.service.IEnterpriseInformationService
+ @Override
public Boolean delEnterprise(String id) {
return Boolean.valueOf(removeById(Long.valueOf(Func.toLong(id))));
}
- @Override // org.springblade.modules.cps.service.IEnterpriseInformationService
+ @Override
public Boolean addEnterprise(EnterpriseInVO enterprise) {
EnterpriseInformation enterpriseInformation = new EnterpriseInformation();
enterpriseInformation.setLink(enterprise.getLink()).setFileName(enterprise.getFileName()).setSuffix(enterprise.getSuffix()).setObjectKey(enterprise.getObjectKey()).setContentLength(enterprise.getContentLength()).setType(enterprise.getType());
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 2af1985..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,6 +27,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.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;
@@ -63,9 +62,8 @@
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;
/**
* 澶瑰叿鏈嶅姟
@@ -91,7 +89,7 @@
this.relatedFixtureService = relatedFixtureService;
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
public Boolean removeFixture(List<Long> ids) {
if (ids.isEmpty()) {
return false;
@@ -107,7 +105,7 @@
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);
@@ -141,7 +139,7 @@
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()));
@@ -156,7 +154,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IFixtureService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public boolean remove(List<Long> ids) {
removeByIds(ids);
@@ -165,14 +163,14 @@
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 -> {
@@ -201,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)) {
@@ -214,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());
@@ -275,13 +264,13 @@
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);
@@ -322,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);
@@ -337,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);
}
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 ca98182..c8c66a4 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
@@ -22,7 +22,6 @@
import com.qianwen.smartman.modules.cps.vo.WcsAndAchievementsVO;
@Service
-
public class GlobalWcsServiceImpl extends ServiceImpl<GlobalWcsMapper, GlobalWcs> implements IGlobalWcsService {
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitBusinessServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitBusinessServiceImpl.java
index 1d5c489..53805b4 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitBusinessServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/InitBusinessServiceImpl.java
@@ -18,7 +18,6 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/InitBusinessServiceImpl.class */
public class InitBusinessServiceImpl implements IInitBusinessService {
private static final Logger log = LoggerFactory.getLogger(InitBusinessServiceImpl.class);
private final DataSource dataSource;
@@ -27,7 +26,7 @@
this.dataSource = dataSource;
}
- @Override // org.springblade.modules.cps.service.IInitBusinessService
+ @Override
public void initApp(Integer appId, ConfigVO configVO) throws Exception {
Connection conn = this.dataSource.getConnection();
ScriptRunner runner = new ScriptRunner(conn);
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
index c25a2bc..4caccc8 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/MachineServiceImpl.java
@@ -102,7 +102,6 @@
import cn.hutool.core.util.StrUtil;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/service/impl/MachineServiceImpl.class */
public class MachineServiceImpl extends BaseServiceImpl<MachineMapper, Machine> implements IMachineService {
private static final Logger log = LoggerFactory.getLogger(MachineServiceImpl.class);
private static final Pattern NUMBER = Pattern.compile("[1-9]\\d*.\\d*|0\\.\\d*[1-9]\\d*");
@@ -132,7 +131,7 @@
private IEmployeeService employeeService;
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public MachineVO insert(MachineVO machineVO) {
checkMachine(machineVO.id, machineVO.getMachineCode());
@@ -145,7 +144,7 @@
return MachineConvert.INSTANCE.convert(machine);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public Boolean changeCollectSwitch(Long workstationId, Integer collectSwitch) {
((MachineMapper) this.baseMapper).changeCollectSwitch(workstationId, collectSwitch, AuthUtil.getTenantId());
if (0 == collectSwitch.intValue()) {
@@ -157,7 +156,7 @@
return true;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<WorkstationWcsDTO> getWorkstationWcsByMachineId(Long machineId, String paramName) {
List<WorkstationOfMachine> workstationOfMachineList = this.workstationOfMachineService.list(Wrappers.<WorkstationOfMachine>lambdaQuery().eq(WorkstationOfMachine::getMachineId, machineId));
@@ -168,7 +167,7 @@
return WorkstationWcsConvert.INSTANCE.convertToDTOList(workstationWcsList);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public Boolean updateBrand(Long id, String brand) {
Machine machine = (Machine) getById(id);
machine.setBrand(brand);
@@ -180,7 +179,7 @@
return Boolean.valueOf(updateById);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public MachineDetailVO detailMachine(Long id) {
MachineDetailVO machineDetailVO = ((MachineMapper) this.baseMapper).selectMachineDetail(id);
if (Func.isNotEmpty(machineDetailVO)) {
@@ -213,7 +212,7 @@
return machineDetailVO;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Machine createMachine(MachineSubmitVO machineSubmitVO) {
String pinCode = machineSubmitVO.getPinCode();
@@ -279,7 +278,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public IPage<MachineListVO> pageMachine(MachineSelectVO machineSelectVO, Query query) {
String machineName = machineSelectVO.getMachineName();
String machineCode = machineSelectVO.getMachineCode();
@@ -295,7 +294,7 @@
return page;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean updateMachine(MachineUpdateVO vo) {
Long id = vo.getId();
@@ -337,7 +336,7 @@
return Boolean.valueOf(updateById);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void renewMachineRepairStatus(Long machineId, Integer maintenanceStatus) {
Machine machine = (Machine)getOne(new QueryWrapper<Machine>().lambda().eq(Machine::getId, machineId));
@@ -347,7 +346,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateMachineRepairPriority(Long deviceId, List<RepairRecord> toBeConfirmedRecordList, List<RepairApply> inMaintenanceApplyList, List<RepairApply> toBeRepairedApplyList) {
if (Func.isNotEmpty(toBeConfirmedRecordList)) {
renewMachineRepairStatus(deviceId, Integer.valueOf(DeviceRepairStatusEnum.TO_BE_CONFIRM.getType()));
@@ -360,7 +359,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void renewMachineRepairTime(Long deviceId) {
Machine machine = (Machine) getById(deviceId);
if (machine != null) {
@@ -369,7 +368,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void createRepairApplyUpdateMachine(Long deviceId, Integer maintenanceStatus) {
Machine machine = (Machine) getById(deviceId);
if (machine != null) {
@@ -382,7 +381,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void implementRepairApply(Long deviceId, Integer maintenanceStatus) {
Machine machine = (Machine) getById(deviceId);
if (Func.isNull(machine.getRepairStatus())) {
@@ -393,7 +392,7 @@
}
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateDeviceMaintainStatus(Long deviceId, Integer status, Long planId, LocalDateTime nextMaintainTime) {
List<MaintainPlan> checkList = checkExistPlanStatus(deviceId, null);
List<MaintainPlan> checkTimeList = checkList.stream().sorted(Comparator.comparing((v0) -> {
@@ -414,7 +413,7 @@
updateDeviceMaintain(deviceMaintainInDTO);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateDeviceMaintain(DeviceMaintainInDTO deviceMaintainInDTO) {
Machine one = (Machine) getById(deviceMaintainInDTO.getDeviceId());
if (one == null) {
@@ -426,7 +425,7 @@
updateById(one);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public void updateDeviceMaintainStatus(Long deviceId, Long planId, LocalDateTime lastMaintainTime) {
List<MaintainPlan> checkList = checkExistPlanStatus(deviceId, null);
List<MaintainPlan> checkTimeList = checkList.stream().sorted(Comparator.comparing((v0) -> {
@@ -450,17 +449,17 @@
updateDeviceMaintain(deviceMaintainInDTO);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<DeviceSimpleDTO> deviceListByDeviceTypeId(Long deviceTypeId) {
return ((MachineMapper) this.baseMapper).deviceListByDeviceTypeId(deviceTypeId);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<DeviceSimpleDTO> deviceListByDeviceIdList(List<Long> deviceIdList) {
return ((MachineMapper) this.baseMapper).deviceListByDeviceIdList(deviceIdList);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public BladeFile exportMachine(MachineSelectVO vo) {
List<MachineDetailVO> vos = ((MachineMapper) this.baseMapper).listMachineDetail(vo.getMachineName(), vo.getMachineCode(), vo.getMachineTypeId(), vo.getGroupId(), CommonGroupConstant.ALL_MACHINE_ID, vo.getStatus());
List<MachineDetailVO> list = vos.stream().peek(c -> {
@@ -474,7 +473,7 @@
return this.ossBuilder.tempTemplate().putFile(multipartFile.getOriginalFilename(), multipartFile);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public BladeFile importMachine(MultipartFile file) {
List<MachineImport> rawData = ExcelUtil.read(file, 0, 2, MachineImport.class);
@@ -676,7 +675,7 @@
});
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
@Transactional(rollbackFor = {Exception.class})
public Boolean delete(IdsVO vo, Integer type) {
if (StatusType.REMOVE.getType().equals(type)) {
@@ -694,7 +693,7 @@
return Boolean.valueOf(changeStatus(Func.toLongList(vo.getIds()), CommonConstant.DEACTIVATE));
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<HmiDeviceVO> getHmiWorkstation(String machineId) {
List<HmiDeviceVO> hmiDeviceVOList = new ArrayList<>();
Machine machine = (Machine) getById(machineId);
@@ -726,12 +725,12 @@
return hmiDeviceVOList;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<MachineExtDTO> getMachineByWorkStation(List<Long> workstationIds) {
return ((MachineMapper) this.baseMapper).getMachineByWorkStation(workstationIds);
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public String queryDateTypeState(Long workstationId) {
return ((MachineMapper) this.baseMapper).queryDateTypeState(WcsDataTypeEnums.WcsDataType.STATE.getCode(), workstationId);
}
@@ -916,7 +915,7 @@
return false;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public MachineDetailVO detailByCode(String machineCode) {
MachineDetailVO machineDetailVO = ((MachineMapper) this.baseMapper).selectMachineDetailByCode(machineCode);
if (Func.isNotEmpty(machineDetailVO)) {
@@ -940,7 +939,7 @@
return machineDetailVO;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public IPage<MachineListVO> pageMachineByParam(MachineSelectVO machineSelectVO, Query query) {
IPage<MachineListVO> page = ((MachineMapper) this.baseMapper).pageMachineByParam(Condition.getPage(query), machineSelectVO);
List<MachineListVO> records = page.getRecords();
@@ -951,12 +950,12 @@
return page;
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<MachineVO> listNoBand() {
return ((MachineMapper) this.baseMapper).listNoBand();
}
- @Override // org.springblade.modules.cps.service.IMachineService
+ @Override
public List<MachineVO> listHaveBand() {
return ((MachineMapper) this.baseMapper).listHaveBand();
}
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
index 39a889c..6da23f3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualOutputServiceImpl.java
@@ -1,20 +1,20 @@
package com.qianwen.smartman.modules.visual.service.impl;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.common.collect.Lists;
-import java.lang.invoke.SerializedLambda;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
+
+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.smartman.common.cache.cps.TimeSliceCache;
import com.qianwen.smartman.common.constant.DateConstant;
import com.qianwen.smartman.common.constant.VisualConstant;
import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.core.tool.utils.DateUtil;
-import com.qianwen.core.tool.utils.Func;
import com.qianwen.smartman.modules.cps.dto.CalendarShiftTimeSlicesDTO;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.entity.WorkstationWcsUsage;
@@ -37,7 +37,8 @@
import com.qianwen.smartman.modules.visual.vo.WorkstationCountVisualQueryVO;
import com.qianwen.smartman.modules.visual.vo.WorkstationShiftOutput;
import com.qianwen.smartman.modules.visual.wrapper.OutputWrapper;
-import org.springframework.stereotype.Service;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/visual/service/impl/VisualOutputServiceImpl.class */
@@ -57,7 +58,7 @@
this.workstationWcsUsageService = workstationWcsUsageService;
}
- @Override // org.springblade.modules.visual.service.IVisualOutputService
+ @Override
public ChartSeriesDataVO getWorkstationHoursOutput(VisualSingleBaseVO visualBaseVO) {
List<String> xList = new ArrayList<>();
Long workstationId = visualBaseVO.getWorkStationId();
@@ -77,7 +78,7 @@
return this.outputWrapper.getWorkstationOutput(outputList, xList, name, 1);
}
- @Override // org.springblade.modules.visual.service.IVisualOutputService
+ @Override
public ChartSeriesDataVO getWorkstationDaysOutput(VisualSingleBaseVO visualBaseVO) {
Long workstationId = visualBaseVO.getWorkStationId();
String timeLevel = visualBaseVO.getTimeLevel();
@@ -90,7 +91,7 @@
return this.outputWrapper.getWorkstationOutput(outputList, xList, name, 2);
}
- @Override // org.springblade.modules.visual.service.IVisualOutputService
+ @Override
public ChartSeriesDataVO getShiftIndexOutput(WorkstationShiftOutput workstationShiftOutput) {
WorkstationChartSeriesDataVO chartSeriesDataVO = new WorkstationChartSeriesDataVO();
List<Workstation> xList = new ArrayList<>();
@@ -155,12 +156,10 @@
return list;
}
- @Override // org.springblade.modules.visual.service.IVisualOutputService
+ @Override
public ChartSeriesDataVO getCountPulseOutput(final WorkstationCountVisualQueryVO visualQueryVO) {
DynamicCountDateAggregateDTO visualCountDateAggregateDTO;
- WorkstationWcsUsage workstationWcsUsage = (WorkstationWcsUsage) this.workstationWcsUsageService.getOne(Lambda.eq((v0) -> {
- return v0.getUsageCode();
- }, visualQueryVO.getUsageCode()));
+ WorkstationWcsUsage workstationWcsUsage = this.workstationWcsUsageService.getOne(Lambda.eq(WorkstationWcsUsage::getUsageCode, visualQueryVO.getUsageCode()));
if (workstationWcsUsage == null) {
return null;
}
--
Gitblit v1.9.3