From 38b7e70c5f995813745fd05368d1bfc44947f72f Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Mon, 15 Apr 2024 16:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E7=9A=84=E6=9C=BA=E5=8F=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?id=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/admin/machine/MachineController.java   | 5 +++--
 .../system/controller/admin/machine/vo/CuttingSaveReqVO.java | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
index c3a2baf40..dc7cd1634 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
@@ -1,5 +1,6 @@
 package com.cf.imes.module.system.controller.admin.machine;
 
+import com.cf.imes.framework.es.core.valid.CreateGroup;
 import com.cf.imes.framework.es.core.valid.UpdateGroup;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
@@ -40,7 +41,7 @@ public class MachineController {
     @Operation(summary = "创建机台")
     @PreAuthorize("@ss.hasPermission('machine::create')")
     @OperateLog(logArgs = false)
-    public CommonResult<Long> createCutting(@Valid @RequestBody CuttingSaveReqVO createReqVO) {
+    public CommonResult<Long> createCutting(@Validated(CreateGroup.class) @RequestBody CuttingSaveReqVO createReqVO) {
         return success(machineService.createCutting(createReqVO));
     }
 
@@ -48,7 +49,7 @@ public class MachineController {
     @Operation(summary = "更新机台")
     @PreAuthorize("@ss.hasPermission('machine::update')")
     @OperateLog(logArgs = false)
-    public CommonResult<Boolean> update( @RequestBody  @Validated(UpdateGroup.class) CuttingSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> update(@Validated(UpdateGroup.class) @RequestBody CuttingSaveReqVO updateReqVO) {
         machineService.updateCutting(updateReqVO);
         return success(true);
     }
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java
index 74d9db6e0..34ef90012 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java
@@ -1,12 +1,11 @@
 package com.cf.imes.module.system.controller.admin.machine.vo;
 
 import com.alibaba.fastjson.JSONObject;
+import com.cf.imes.framework.es.core.valid.CreateGroup;
 import com.cf.imes.framework.es.core.valid.UpdateGroup;
-import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -34,7 +33,7 @@ public class CuttingSaveReqVO {
     private Long labelId;
 
     @Schema(description = "机台模板id")
-    @NotNull(message = "机台模板id")
+    @NotNull(groups = CreateGroup.class, message = "机台模板id不能空")
     private Long templateId;
 
    /* @Schema(description = "机台配置")