smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CalendarController.java
@@ -1,15 +1,17 @@ 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 java.util.Optional; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.lang.invoke.SerializedLambda; import java.util.List; import java.util.Optional; import com.qianwen.core.boot.ctrl.BladeController; import com.qianwen.core.mp.support.Condition; import com.qianwen.core.mp.support.Query; @@ -32,11 +34,9 @@ import com.qianwen.smartman.modules.cps.vo.CalendarUpdateVO; import com.qianwen.smartman.modules.cps.vo.CalendarVO; import com.qianwen.smartman.modules.cps.vo.ProductionCalendarVO; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @ApiResource({"blade-cps/calendar"}) @Api(value = "生产日历controller", tags = {"生产日历controller"}) smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/CommonGroupController.java
@@ -1,22 +1,21 @@ 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 java.util.Map; import javax.validation.Valid; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; 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.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import 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.smartman.common.constant.CommonConstant; import com.qianwen.smartman.common.utils.MessageUtils; import com.qianwen.core.excel.util.ExcelUtil; import com.qianwen.core.log.exception.ServiceException; import com.qianwen.core.mp.support.Condition; @@ -31,6 +30,9 @@ import com.qianwen.core.tool.api.ResultCode; 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.constant.CommonConstant; import com.qianwen.smartman.common.utils.MessageUtils; import com.qianwen.smartman.modules.cps.convert.CommonGroupConvert; import com.qianwen.smartman.modules.cps.entity.CommonGroup; import com.qianwen.smartman.modules.cps.excel.CommonGroupImport; @@ -44,19 +46,17 @@ import com.qianwen.smartman.modules.cps.vo.TagCommonGroupVO; import com.qianwen.smartman.modules.cps.vo.UpdateCommonGroupVO; import com.qianwen.smartman.modules.cps.vo.WorkstationInGroupVO; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; 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.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import springfox.documentation.annotations.ApiIgnore; @ApiResource({"blade-cps/group"}) @Api(value = "组", tags = {"组"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/CommonGroupController.class */ public class CommonGroupController { private final ICommonGroupService groupService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/ProductTypeController.java
@@ -1,22 +1,20 @@ package com.qianwen.smartman.modules.cps.controller; import cn.hutool.core.collection.CollectionUtil; 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.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.validation.Valid; import com.qianwen.smartman.common.cache.RegionCache; import com.qianwen.smartman.common.constant.CommonConstant; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; 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 com.qianwen.core.boot.ctrl.BladeController; import com.qianwen.core.mp.support.Condition; import com.qianwen.core.mp.support.Query; @@ -28,6 +26,8 @@ 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.common.constant.CommonConstant; import com.qianwen.smartman.modules.cps.convert.ProductTypeConvert; import com.qianwen.smartman.modules.cps.entity.Product; import com.qianwen.smartman.modules.cps.entity.ProductType; @@ -36,17 +36,16 @@ import com.qianwen.smartman.modules.cps.vo.ProductTypeChangeStatusVO; import com.qianwen.smartman.modules.cps.vo.ProductTypePlanVO; import com.qianwen.smartman.modules.cps.vo.ProductTypeVO; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import cn.hutool.core.collection.CollectionUtil; 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/product-type"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/ProductTypeController.class */ public class ProductTypeController extends BladeController { private final IProductTypeService productTypeService; private final IProductService productService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationController.java
@@ -51,7 +51,6 @@ @ApiResource({"blade-cps/workstation"}) @NonDS @Validated /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WorkstationController.class */ public class WorkstationController extends BladeController { private final IWorkstationService workstationService; private final IDmpVariablesService dmpVariablesService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWcsController.java
@@ -29,7 +29,6 @@ @ApiResource({"blade-cps/workstation-wcs"}) @NonDS @Validated /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WorkstationWcsController.class */ public class WorkstationWcsController extends BladeController { private final IWorkstationWcsService workstationWcsService; private final IMachineService machineService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/controller/WorkstationWorkbenchController.java
@@ -26,7 +26,6 @@ @ApiResource({"blade-cps/workstation-workbench"}) @NonDS @Validated /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/controller/WorkstationWorkbenchController.class */ public class WorkstationWorkbenchController { private final IWorkstationWorkbenchService workbenchService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/entity/GlobalWcs.java
@@ -4,7 +4,6 @@ import java.io.Serializable; @TableName("blade_global_wcs") /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/cps/entity/GlobalWcs.class */ public class GlobalWcs implements Serializable { private static final long serialVersionUID = 1; private String code; smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java
@@ -36,7 +36,6 @@ @Api(value = "加工过程参数controller", tags = {"加工过程参数controller"}) @ApiResource({"blade-mdc/process-parameter"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/controller/ProcessParameterController.class */ public class ProcessParameterController { private final IProcessParameterService processParameterService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/TimeUsedAnalysisController.java
@@ -23,7 +23,6 @@ @Api(value = "用时分析controller", tags = {"用时分析controller"}) @ApiResource({"blade-mdc/time-used-analysis"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/controller/TimeUsedAnalysisController.class */ public class TimeUsedAnalysisController { private final ITimeUsedAnalysisService superAggregateStateService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationAnalysisController.java
@@ -22,7 +22,6 @@ @Api(value = "工位分析controller", tags = {"工位分析controller"}) @ApiResource({"blade-mdc/work-station-analysis"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/controller/WorkstationAnalysisController.class */ public class WorkstationAnalysisController { private final IWorkstationAnalysisService workstationAnalysisService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/WorkstationFeedbackController.java
@@ -53,7 +53,6 @@ @Api(value = "工位反馈", tags = {"工位反馈"}) @ApiResource({"blade-cps/workstation-wcs-feedback"}) @RestController /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/controller/WorkstationFeedbackController.class */ public class WorkstationFeedbackController { private final IWorkstationFeedbackService wcsFeedbackService; private final IWorkstationService workstationService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/DictController.java
@@ -39,7 +39,6 @@ @RestController @ApiResource({"blade-system/dict"}) @NonDS /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/DictController.class */ public class DictController extends BladeController { private final IDictService dictService; smart-man-boot/src/main/java/com/qianwen/smartman/modules/system/controller/ParamController.java
@@ -46,7 +46,6 @@ @RestController @ApiResource({"blade-system/param"}) @NonDS /* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/system/controller/ParamController.class */ public class ParamController extends BladeController { private final IParamService paramService; @Autowired