Эх сурвалжийг харах

去掉controller的Validate 增加方法的Valid

shudonghui 1 жил өмнө
parent
commit
a3c19711a2

+ 8 - 8
sop-server/src/main/java/com/qmth/sop/server/api/SysCustomController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Map;
@@ -41,7 +42,6 @@ import java.util.Map;
 @Api(tags = "客户表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_CUSTOM)
-@Validated
 public class SysCustomController {
 
 
@@ -65,8 +65,8 @@ public class SysCustomController {
             @ApiParam(value = "客户经理id", required = false) @RequestParam(required = false) Long managerId,
             @ApiParam(value = "客户名称", required = false) @RequestParam(required = false) String name,
             @ApiParam(value = "服务档位id", required = false) @RequestParam(required = false) Long levelId,
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+            @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysCustomResult> resultIPage = sysCustomService.query(new Page<>(pageNumber, pageSize), type, managerId, name, levelId);
         return ResultUtil.ok(resultIPage);
     }
@@ -75,7 +75,7 @@ public class SysCustomController {
     @ApiOperation(value = "新增客户表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增客户表信息", response = Object.class)})
-    public Result add(@ApiParam(value = "客户信息", required = true) @RequestBody(required = true) SysCustomResult sysCustom) {
+    public Result add(@Valid @ApiParam(value = "客户信息", required = true) @RequestBody(required = true) SysCustomResult sysCustom) {
         sysCustomService.add(sysCustom);
         return ResultUtil.ok();
     }
@@ -84,7 +84,7 @@ public class SysCustomController {
     @ApiOperation(value = "修改客户表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改客户表信息", response = Object.class)})
-    public Result update(@ApiParam(value = "客户信息", required = true) @RequestBody(required = true) SysCustomResult sysCustom) {
+    public Result update(@Valid @ApiParam(value = "客户信息", required = true) @RequestBody(required = true) SysCustomResult sysCustom) {
         sysCustomService.update(sysCustom);
         return ResultUtil.ok();
     }
@@ -92,7 +92,7 @@ public class SysCustomController {
     @ApiOperation(value = "删除客户表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除客户表信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "客户id", required = true) @RequestParam(required = true) long id) {
+    public Result delete(@Valid @ApiParam(value = "客户id", required = true) @RequestParam(required = true) long id) {
         sysCustomService.delete(id);
         return ResultUtil.ok();
     }
@@ -106,7 +106,7 @@ public class SysCustomController {
     @ApiOperation(value = "获取单个客户")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "获取单个客户", response = SysCustomResult.class)})
-    public Result detail(@ApiParam(value = "客户id", required = true) @RequestParam(required = true) long id) {
+    public Result detail(@Valid @ApiParam(value = "客户id", required = true) @RequestParam(required = true) long id) {
         SysCustom sysCustom = sysCustomService.getById(id);
         SysCustomResult sysCustomResult= JSON.toJavaObject((JSON) JSON.toJSON(sysCustom),SysCustomResult.class);
         sysCustomResult.setRoleList(sysCustomRoleService.getList(sysCustom.getId()));
@@ -117,7 +117,7 @@ public class SysCustomController {
     @ApiOperation(value = "客户表导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result importCustom(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
+    public Result importCustom(@Valid @ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws Exception {
         Map<String, Object> map = tbTaskService.saveTask(file, TaskTypeEnum.CUSTOM_IMPORT);
         asyncSysCustomImportService.importTask(map);
         TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);

+ 8 - 8
sop-server/src/main/java/com/qmth/sop/server/api/SysDeviceController.java

@@ -22,6 +22,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Objects;
@@ -38,7 +39,6 @@ import java.util.Objects;
 @Api(tags = "设备配置表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_DEVICE)
-@Validated
 public class SysDeviceController {
 
 
@@ -51,8 +51,8 @@ public class SysDeviceController {
     @ApiResponses({@ApiResponse(code = 200, message = "设备配置表列表信息", response = SysDeviceResult.class)})
     public Result query(
                 @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String query,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysDeviceResult> resultIPage = sysDeviceService.query(new Page<>(pageNumber, pageSize),query);
 
         return ResultUtil.ok(resultIPage);
@@ -62,7 +62,7 @@ public class SysDeviceController {
     @ApiOperation(value = "新增设备配置表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增设备配置表信息", response = Object.class)})
-    public Result add(@ApiParam(value = "设备配置表信息", required = true) @RequestBody(required = true) SysDevice sysDevice) {
+    public Result add(@Valid @ApiParam(value = "设备配置表信息", required = true) @RequestBody(required = true) SysDevice sysDevice) {
         sysDeviceService.add(sysDevice);
         return ResultUtil.ok();
     }
@@ -72,7 +72,7 @@ public class SysDeviceController {
     @ApiOperation(value = "修改设备配置表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改设备配置表信息", response = Object.class)})
-    public Result update(@ApiParam(value = "设备配置表信息", required = true) @RequestBody(required = true) SysDevice sysDevice) {
+    public Result update(@Valid @ApiParam(value = "设备配置表信息", required = true) @RequestBody(required = true) SysDevice sysDevice) {
         sysDeviceService.update(sysDevice);
         return ResultUtil.ok();
     }
@@ -81,7 +81,7 @@ public class SysDeviceController {
     @ApiOperation(value = "删除设备配置表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除设备配置表信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "设备配置表信息", required = true) @RequestParam(required = true) long id) {
+    public Result delete(@Valid @ApiParam(value = "设备配置表信息", required = true) @RequestParam(required = true) long id) {
         sysDeviceService.delete(id);
         return ResultUtil.ok();
     }
@@ -103,7 +103,7 @@ public class SysDeviceController {
     @ApiOperation(value = "停用设备配置接口")
     @RequestMapping(value = "/disable", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "停用设备配置", response = Object.class)})
-    public Result disable(@ApiParam(value = "设备配置表信息", required = true) @RequestParam(required = true) long id) {
+    public Result disable(@Valid @ApiParam(value = "设备配置表信息", required = true) @RequestParam(required = true) long id) {
         sysDeviceService.disable(id);
         return ResultUtil.ok();
     }
@@ -116,7 +116,7 @@ public class SysDeviceController {
     @ApiOperation(value = "获取单个设备配置接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "获取单个设备配置", response = SysDevice.class)})
-    public Result get(@ApiParam(value = "设备配置表id", required = true) @RequestParam(required = true) long id) {
+    public Result get(@Valid @ApiParam(value = "设备配置表id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(sysDeviceService.getById(id));
     }
 

+ 6 - 6
sop-server/src/main/java/com/qmth/sop/server/api/SysDingDateController.java

@@ -16,6 +16,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.List;
@@ -33,7 +34,6 @@ import java.util.Objects;
 @Api(tags = "考勤特殊日期 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+"/sys/ding/date")
-@Validated
 public class SysDingDateController {
 
 
@@ -46,8 +46,8 @@ public class SysDingDateController {
     @ApiResponses({@ApiResponse(code = 200, message = "考勤特殊日期查询结果", response = SysDingDate.class)})
     public Result query(
                 @ApiParam(value = "模糊查询条件", required = false) @RequestParam(required = false) String query,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysDingDate> resultIPage = sysDingDateService.query(new Page<>(pageNumber, pageSize),query);
 
         return ResultUtil.ok(resultIPage);
@@ -57,7 +57,7 @@ public class SysDingDateController {
     @ApiOperation(value = "考勤特殊日期新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result save(@ApiParam(value = "考勤特殊日期信息", required = true) @RequestBody(required = true) SysDingDate sysDingDate) {
+    public Result save(@Valid @ApiParam(value = "考勤特殊日期信息", required = true) @RequestBody(required = true) SysDingDate sysDingDate) {
         return ResultUtil.ok(sysDingDateService.saveSysDingDate(sysDingDate));
     }
 
@@ -66,7 +66,7 @@ public class SysDingDateController {
     @ApiOperation(value = "考勤特殊日期删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "考勤特殊日期id", required = true) @RequestParam(required = true) long id) {
+    public Result delete(@Valid @ApiParam(value = "考勤特殊日期id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(sysDingDateService.delete(id));
     }
 
@@ -75,7 +75,7 @@ public class SysDingDateController {
     @ApiOperation(value = "考勤特殊日期获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤特殊日期信息", response = SysDingDate.class)})
-    public Result get(@ApiParam(value = "考勤特殊日期id", required = true) @RequestParam long id) {
+    public Result get(@Valid @ApiParam(value = "考勤特殊日期id", required = true) @RequestParam long id) {
         return ResultUtil.ok(sysDingDateService.getById(id));
     }
 

+ 7 - 7
sop-server/src/main/java/com/qmth/sop/server/api/SysDingGroupController.java

@@ -22,6 +22,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.List;
@@ -39,7 +40,6 @@ import java.util.Objects;
 @Api(tags = "考勤组表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_DING_GROUP)
-@Validated
 public class SysDingGroupController {
 
 
@@ -56,8 +56,8 @@ public class SysDingGroupController {
     public Result query(
                 @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String query,
                 @ApiParam(value = "服务单元id", required = false) @RequestParam(required = false) Long serviceId,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysDingGroupResult> resultIPage = sysDingGroupService.query(new Page<>(pageNumber, pageSize),query,serviceId);
 
         return ResultUtil.ok(resultIPage);
@@ -67,7 +67,7 @@ public class SysDingGroupController {
     @ApiOperation(value = "新增考勤组表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增考勤组表信息", response = Object.class)})
-    public Result add(@ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroupResult sysDingGroup) {
+    public Result add(@Valid @ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroupResult sysDingGroup) {
         sysDingGroupService.add(sysDingGroup);
         return ResultUtil.ok();
     }
@@ -77,7 +77,7 @@ public class SysDingGroupController {
     @ApiOperation(value = "修改考勤组表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改考勤组表信息", response = Object.class)})
-    public Result update(@ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroupResult sysDingGroup) {
+    public Result update(@Valid @ApiParam(value = "考勤组表信息", required = true) @RequestBody(required = true) SysDingGroupResult sysDingGroup) {
         sysDingGroupService.update(sysDingGroup);
         return ResultUtil.ok();
     }
@@ -87,7 +87,7 @@ public class SysDingGroupController {
     @ApiOperation(value = "删除考勤组表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除考勤组表信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "考勤组表信息", required = true) @RequestParam(required = true) long id) {
+    public Result delete(@Valid @ApiParam(value = "考勤组表信息", required = true) @RequestParam(required = true) long id) {
         sysDingGroupService.delete(id);
         return ResultUtil.ok();
     }
@@ -111,7 +111,7 @@ public class SysDingGroupController {
     @ApiOperation(value = "获取单个考勤组表信息")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "考勤组表信息", response = SysDingGroupResult.class)})
-    public Result get(@ApiParam(value = "id", required = true) @RequestParam(value = "id") long id) {
+    public Result get(@Valid @ApiParam(value = "id", required = true) @RequestParam(value = "id") long id) {
         SysDingGroup sysDingGroup = sysDingGroupService.getById(id);
         SysDingGroupResult sysDingGroupResult= JSON.toJavaObject((JSON) JSON.toJSON(sysDingGroup),SysDingGroupResult.class);
         sysDingGroupResult.setDingObjs(sysDingObjService.getList(id));

+ 7 - 7
sop-server/src/main/java/com/qmth/sop/server/api/SysLevelController.java

@@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Objects;
@@ -36,7 +37,6 @@ import java.util.Objects;
 @Api(tags = "档位表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_LEVEL)
-@Validated
 public class SysLevelController {
 
 
@@ -52,8 +52,8 @@ public class SysLevelController {
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "档位表列表信息", response = SysLevelResult.class)})
     public Result query(
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+            @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysLevelResult> resultIPage = sysLevelService.query(new Page<>(pageNumber, pageSize));
 
         return ResultUtil.ok(resultIPage);
@@ -63,7 +63,7 @@ public class SysLevelController {
     @ApiOperation(value = "新增档位表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增档位表信息", response = Object.class)})
-    public Result add(@ApiParam(value = "档位表信息", required = true) @RequestBody(required = true) SysLevelResult sysLevelResult) {
+    public Result add(@Valid @ApiParam(value = "档位表信息", required = true) @RequestBody(required = true) SysLevelResult sysLevelResult) {
         sysLevelService.add(sysLevelResult);
         return ResultUtil.ok();
     }
@@ -72,7 +72,7 @@ public class SysLevelController {
     @ApiOperation(value = "修改档位表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改档位表信息", response = Object.class)})
-    public Result update(@ApiParam(value = "档位表信息", required = true) @RequestBody(required = true) SysLevelResult sysLevelResult) {
+    public Result update(@Valid @ApiParam(value = "档位表信息", required = true) @RequestBody(required = true) SysLevelResult sysLevelResult) {
         sysLevelService.update(sysLevelResult);
         return ResultUtil.ok();
     }
@@ -81,7 +81,7 @@ public class SysLevelController {
     @ApiOperation(value = "删除档位表接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除档位表信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "档位表信息", required = true) @RequestParam(required = true) long id) {
+    public Result delete(@Valid @ApiParam(value = "档位表信息", required = true) @RequestParam(required = true) long id) {
         sysLevelService.delete(id);
         return ResultUtil.ok();
     }
@@ -109,7 +109,7 @@ public class SysLevelController {
     @ApiOperation(value = "获取单个档位表接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "档位表", response = SysLevelResult.class)})
-    public Result get(@ApiParam(value = "档位表id", required = true) @RequestParam long id) {
+    public Result get(@Valid @ApiParam(value = "档位表id", required = true) @RequestParam long id) {
         SysLevel sysLevel =sysLevelService.getById(id);
         SysLevelResult sysLevelResult= JSON.toJavaObject((JSON) JSON.toJSON(sysLevel),SysLevelResult.class);
         sysLevelResult.setRoleList(sysLevelRoleService.getList(sysLevelResult.getId()));

+ 12 - 12
sop-server/src/main/java/com/qmth/sop/server/api/SysMessageController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Map;
@@ -41,7 +42,6 @@ import java.util.Objects;
 @Api(tags = "系统消息 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_MESSAGE)
-@Validated
 public class SysMessageController {
 
 
@@ -58,12 +58,12 @@ public class SysMessageController {
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "回执查询结果", response = SysMessageResult.class)})
     public Result query(
-                @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
+            @Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
                 @ApiParam(value = "区域城市", required = false) @RequestParam(required = false) String city,
                 @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
                 @ApiParam(value = "回执状态", required = false) @RequestParam(required = false) Boolean status,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysMessageResult> resultIPage = sysMessageService.query(new Page<>(pageNumber, pageSize),noticeId,city,supplierId,status);
         return ResultUtil.ok(resultIPage);
     }
@@ -71,7 +71,7 @@ public class SysMessageController {
     @ApiOperation(value = "回执查询导出")
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result export(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
+    public Result export(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) Long noticeId,
                          @ApiParam(value = "区域城市", required = false) @RequestParam(required = false) String city,
                          @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
                          @ApiParam(value = "回执状态", required = false) @RequestParam(required = false) Boolean status) throws Exception {
@@ -91,7 +91,7 @@ public class SysMessageController {
     @ApiOperation(value = "回执统计已读和未读")
     @RequestMapping(value = "/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessageCountResult.class)})
-    public Result count(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long noticeId) throws Exception {
+    public Result count(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long noticeId) throws Exception {
         return ResultUtil.ok(sysMessageService.count(noticeId));
     }
 
@@ -103,7 +103,7 @@ public class SysMessageController {
     @ApiOperation(value = "标记消息已阅读")
     @RequestMapping(value = "/read", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result read(@ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
+    public Result read(@Valid @ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(sysMessageService.read(id));
     }
 
@@ -114,7 +114,7 @@ public class SysMessageController {
     @ApiOperation(value = "查看消息详细")
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessage.class)})
-    public Result get(@ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
+    public Result get(@Valid @ApiParam(value = "消息表id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(sysMessageService.getById(id));
     }
 
@@ -123,7 +123,7 @@ public class SysMessageController {
     @ApiOperation(value = "按多个类型统计当前用户未读消息")
     @RequestMapping(value = "/countByTypes", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result countByTypes(@ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types) {
+    public Result countByTypes(@Valid @ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types) {
         return ResultUtil.ok(sysMessageService.countByTypes(types));
     }
 
@@ -132,15 +132,15 @@ public class SysMessageController {
     @ApiOperation(value = "按多个类型查询当前用户未读消息")
     @RequestMapping(value = "/pageByTypes", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = SysMessageWorkResult.class)})
-    public Result pageByTypes(@ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types,
+    public Result pageByTypes(@Valid @ApiParam(value = "消息类型", required = true) @RequestParam(required = true) MessageTypeEnum[] types,
                               @ApiParam(value = "是否已读", required = false) @RequestParam(required = false) Boolean status,
                               @ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
                               @ApiParam(value = "客户名称(模糊查询)", required = false) @RequestParam(required = false) String custom,
                               @ApiParam(value = "内容模糊查询", required = false) @RequestParam(required = false) String query,
                               @ApiParam(value = "发送时间开始", required = false) @RequestParam(required = false) Long startTime,
                               @ApiParam(value = "发送时间结束", required = false) @RequestParam(required = false) Long endTime,
-                              @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                              @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                              @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                              @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysMessageWorkResult> resultIPage = sysMessageService.pageByTypes(new Page<>(pageNumber, pageSize),types,status,serviceId,custom,query,startTime,endTime);
         return ResultUtil.ok(resultIPage);
     }

+ 8 - 8
sop-server/src/main/java/com/qmth/sop/server/api/SysNoticeController.java

@@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 
@@ -33,7 +34,6 @@ import javax.validation.constraints.Min;
 @Api(tags = "公告表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_NOTICE)
-@Validated
 public class SysNoticeController {
 
 
@@ -50,8 +50,8 @@ public class SysNoticeController {
                 @ApiParam(value = "发布类型", required = false) @RequestParam(required = false) NoticeTypeEnum type,
                 @ApiParam(value = "发布时间开始", required = false) @RequestParam(required = false) Long startTime,
                 @ApiParam(value = "发布时间结束", required = false) @RequestParam(required = false) Long endTime,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysNoticeResult> resultIPage = sysNoticeService.query(new Page<>(pageNumber, pageSize),query,status,type,startTime,endTime);
 
         return ResultUtil.ok(resultIPage);
@@ -61,7 +61,7 @@ public class SysNoticeController {
     @ApiOperation(value = "公告表新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result save(@ApiParam(value = "公告表信息", required = true) @RequestBody(required = true) SysNotice sysNotice) {
+    public Result save(@Valid @ApiParam(value = "公告表信息", required = true) @RequestBody(required = true) SysNotice sysNotice) {
         return ResultUtil.ok(sysNoticeService.saveSysNotice(sysNotice));
     }
 
@@ -70,7 +70,7 @@ public class SysNoticeController {
     @ApiOperation(value = "公告表删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long id) {
+    public Result delete(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(sysNoticeService.delete(id));
     }
     /*
@@ -80,7 +80,7 @@ public class SysNoticeController {
     @ApiOperation(value = "公告表批量禁用接口")
     @RequestMapping(value = "/disable", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public  Result disable(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long[] ids) {
+    public  Result disable(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long[] ids) {
         return ResultUtil.ok(sysNoticeService.disable(ids));
     }
 
@@ -91,7 +91,7 @@ public class SysNoticeController {
     @ApiOperation(value = "公告表发布或者撤销发布接口")
     @RequestMapping(value = "/publishOrUnpublish", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public  Result publishOrUnpublish(@ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long id) {
+    public  Result publishOrUnpublish(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(sysNoticeService.publishOrUnpublish(id));
     }
 
@@ -99,7 +99,7 @@ public class SysNoticeController {
     @ApiOperation(value = "公告表获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "公告表信息", response = SysNotice.class)})
-    public Result get(@ApiParam(value = "公告表id", required = true) @RequestParam long id) {
+    public Result get(@Valid @ApiParam(value = "公告表id", required = true) @RequestParam long id) {
         return ResultUtil.ok(sysNoticeService.getById(id));
     }
 

+ 7 - 7
sop-server/src/main/java/com/qmth/sop/server/api/SysSupplierController.java

@@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Objects;
@@ -31,7 +32,6 @@ import java.util.Objects;
 @Api(tags = "供应商表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+ SystemConstant.PREFIX_URL_SUPPLIER)
-@Validated
 public class SysSupplierController {
 
 
@@ -42,8 +42,8 @@ public class SysSupplierController {
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "供应商表列表信息", response = SysSupplier.class)})
     public Result query(
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+            @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @Valid  @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<SysSupplier> resultIPage = sysSupplierService.query(new Page<>(pageNumber, pageSize));
 
         return ResultUtil.ok(resultIPage);
@@ -51,7 +51,7 @@ public class SysSupplierController {
     @ApiOperation(value = "新增供应商表接口")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "新增供应商表信息", response = Object.class)})
-    public Result add(@ApiParam(value = "供应商表信息", required = true) @RequestBody(required = true) SysSupplier sysSupplier) {
+    public Result add(@Valid @ApiParam(value = "供应商表信息", required = true) @RequestBody(required = true) SysSupplier sysSupplier) {
         sysSupplierService.add(sysSupplier);
         return ResultUtil.ok();
     }
@@ -59,7 +59,7 @@ public class SysSupplierController {
     @ApiOperation(value = "修改供应商表接口")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "修改供应商表信息", response = Object.class)})
-    public Result update(@ApiParam(value = "供应商表信息", required = true) @RequestBody(required = true) SysSupplier sysSupplier) {
+    public Result update(@Valid @ApiParam(value = "供应商表信息", required = true) @RequestBody(required = true) SysSupplier sysSupplier) {
         sysSupplierService.update(sysSupplier);
         return ResultUtil.ok();
     }
@@ -77,7 +77,7 @@ public class SysSupplierController {
     @ApiOperation(value = "启用禁用供应商表接口")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "启用禁用供应商表信息", response = Object.class)})
-    public Result enable(@ApiParam(value = "供应商表信息", required = true) @RequestParam(required = true) long id) {
+    public Result enable(@Valid @ApiParam(value = "供应商表信息", required = true) @RequestParam(required = true) long id) {
         sysSupplierService.enable(id);
         return ResultUtil.ok();
     }
@@ -102,7 +102,7 @@ public class SysSupplierController {
     @ApiOperation(value = "获取单个供应商表信息接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "供应商表信息", response = SysSupplier.class)})
-    public Result info(@ApiParam(value = "供应商表id", required = true) @RequestParam long id) {
+    public Result info(@Valid @ApiParam(value = "供应商表id", required = true) @RequestParam long id) {
         return ResultUtil.ok(sysSupplierService.getById(id));
     }
 

+ 9 - 9
sop-server/src/main/java/com/qmth/sop/server/api/TBCrmController.java

@@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 
@@ -33,7 +34,6 @@ import javax.validation.constraints.Min;
 @Api(tags = "派单信息表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_CRM)
-@Validated
 public class TBCrmController {
 
 
@@ -53,8 +53,8 @@ public class TBCrmController {
             @ApiParam(value = "项目单号(模糊查询) ", required = false) @RequestParam(required = false) String crmNo,
             @ApiParam(value = "派单时间开始", required = false) @RequestParam(required = false) Long startTime,
             @ApiParam(value = "派单时间结束", required = false) @RequestParam(required = false) Long endTime,
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+            @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TBCrmResult> resultIPage = tBCrmService.query(new Page<>(pageNumber, pageSize), serviceId,leadId,crmUserId,type,custom,crmNo,startTime,endTime);
 
         return ResultUtil.ok(resultIPage);
@@ -64,7 +64,7 @@ public class TBCrmController {
     @ApiOperation(value = "派单信息表新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result save(@ApiParam(value = "派单信息表信息", required = true) @RequestBody(required = true) TBCrm tBCrm) {
+    public Result save(@Valid @ApiParam(value = "派单信息表信息", required = true) @RequestBody(required = true) TBCrm tBCrm) {
         return ResultUtil.ok(tBCrmService.saveTBCrm(tBCrm));
     }
 
@@ -73,7 +73,7 @@ public class TBCrmController {
     @ApiOperation(value = "派单信息表删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "派单信息表id", required = true) @RequestParam(required = true) long id) {
+    public Result delete(@Valid @ApiParam(value = "派单信息表id", required = true) @RequestParam(required = true) long id) {
         return ResultUtil.ok(tBCrmService.delete(id));
     }
 
@@ -82,7 +82,7 @@ public class TBCrmController {
     @ApiOperation(value = "派单信息表获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "派单信息表信息", response = TBCrm.class)})
-    public Result get(@ApiParam(value = "派单信息表id", required = true) @RequestParam long id) {
+    public Result get(@Valid @ApiParam(value = "派单信息表id", required = true) @RequestParam long id) {
         return ResultUtil.ok(tBCrmService.getById(id));
     }
 
@@ -91,8 +91,8 @@ public class TBCrmController {
     @ApiOperation(value = "批量划定服务单元接口")
     @RequestMapping(value = "/batchZone", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result batchZone(@ApiParam(value = "服务单元id", required = true) @RequestParam(required = true) long serviceId,
-                            @ApiParam(value = "派单信息表id", required = true) @RequestParam(required = true) long[] crmIds) {
+    public Result batchZone(@Valid @ApiParam(value = "服务单元id", required = true) @RequestParam(required = true) long serviceId,
+                            @Valid @ApiParam(value = "派单信息表id", required = true) @RequestParam(required = true) long[] crmIds) {
         return ResultUtil.ok(tBCrmService.batchZone(serviceId, crmIds));
     }
 
@@ -101,7 +101,7 @@ public class TBCrmController {
     @ApiOperation(value = "批量禁用接口")
     @RequestMapping(value = "/batchDisable", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result batchDisable(@ApiParam(value = "派单信息表id", required = true) @RequestParam(required = true) long[] crmIds) {
+    public Result batchDisable(@Valid @ApiParam(value = "派单信息表id", required = true) @RequestParam(required = true) long[] crmIds) {
         return ResultUtil.ok(tBCrmService.batchDisable(crmIds));
     }
 

+ 6 - 6
sop-server/src/main/java/com/qmth/sop/server/api/TBDelayWarnController.java

@@ -20,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.List;
@@ -37,7 +38,6 @@ import java.util.Objects;
 @Api(tags = "延期预警跟进表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_DELAY_WARN)
-@Validated
 public class TBDelayWarnController {
 
 
@@ -57,8 +57,8 @@ public class TBDelayWarnController {
                 @ApiParam(value = "SOP流水号(模糊查询)", required = false) @RequestParam(required = false) String sopNo,
                 @ApiParam(value = "预警时间开始", required = false) @RequestParam(required = false) Long startTime,
                 @ApiParam(value = "预警时间结束", required = false) @RequestParam(required = false) Long endTime,
-                @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(pageNumber, pageSize),type,status,serviceId,custom,fieldObj,sopNo,startTime,endTime,null);
 
         return ResultUtil.ok(resultIPage);
@@ -69,7 +69,7 @@ public class TBDelayWarnController {
     @ApiOperation(value = "延期预警跟进表获取单个接口")
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警跟进表信息", response = TBDelayWarnResult.class)})
-    public Result get(@ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
+    public Result get(@Valid @ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
         IPage<TBDelayWarnResult> resultIPage = tBDelayWarnService.query(new Page<>(1, 1),null,null,null,null,null,null,null,null,id);
         return ResultUtil.ok(resultIPage.getRecords().get(0));
     }
@@ -79,7 +79,7 @@ public class TBDelayWarnController {
     @ApiOperation(value = "关闭延期预警跟进")
     @RequestMapping(value = "/close", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "关闭成功")})
-    public Result close(@ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
+    public Result close(@Valid @ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
         TBDelayWarn tBDelayWarn = tBDelayWarnService.getById(id);
         tBDelayWarn.setStatus(DelayWarnStatusEnum.CLOSE);
         tBDelayWarnService.saveTBDelayWarn(tBDelayWarn);
@@ -90,7 +90,7 @@ public class TBDelayWarnController {
     @ApiOperation(value = "重启延期预警跟进")
     @RequestMapping(value = "/restart", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "重启成功")})
-    public Result restart(@ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
+    public Result restart(@Valid @ApiParam(value = "延期预警跟进表id", required = true) @RequestParam long id) {
         TBDelayWarn tBDelayWarn = tBDelayWarnService.getById(id);
         tBDelayWarn.setStatus(DelayWarnStatusEnum.RESTART);
         tBDelayWarnService.saveTBDelayWarn(tBDelayWarn);

+ 3 - 3
sop-server/src/main/java/com/qmth/sop/server/api/TBDelayWarnDetailController.java

@@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -28,7 +29,6 @@ import java.util.List;
 @Api(tags = "延期预警明细表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_DELAY_WARN_DETAIL)
-@Validated
 public class TBDelayWarnDetailController {
 
 
@@ -39,7 +39,7 @@ public class TBDelayWarnDetailController {
     @ApiOperation(value = "延期预警明细表查询接口")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "延期预警明细表查询结果", response = TBDelayWarnDetail.class)})
-    public Result list(@ApiParam(value = "延期预警表id", required = true) @RequestParam(required = true) long id) {
+    public Result list(@Valid @ApiParam(value = "延期预警表id", required = true) @RequestParam(required = true) long id) {
         List<TBDelayWarnDetail> resultIPage = tBDelayWarnDetailService.list(new QueryWrapper<TBDelayWarnDetail>().lambda().eq(TBDelayWarnDetail::getDelayWarnId, id).orderByDesc(TBDelayWarnDetail::getCreateTime));
         return ResultUtil.ok(resultIPage);
     }
@@ -48,7 +48,7 @@ public class TBDelayWarnDetailController {
     @ApiOperation(value = "延期预警明细表新增修改接口")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result save(@ApiParam(value = "延期预警明细表信息", required = true) @RequestBody(required = true) TBDelayWarnDetail tBDelayWarnDetail) {
+    public Result save(@Valid @ApiParam(value = "延期预警明细表信息", required = true) @RequestBody(required = true) TBDelayWarnDetail tBDelayWarnDetail) {
         return ResultUtil.ok(tBDelayWarnDetailService.saveTBDelayWarnDetail(tBDelayWarnDetail));
     }
 

+ 3 - 3
sop-server/src/main/java/com/qmth/sop/server/api/TBDingController.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.Map;
@@ -40,7 +41,6 @@ import java.util.Map;
 @Api(tags = "考勤打卡表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_DING)
-@Validated
 public class TBDingController {
 
 
@@ -65,8 +65,8 @@ public class TBDingController {
             @ApiParam(value = "客户名称(模糊查询)", required = false) @RequestParam(required = false) String custom,
             @ApiParam(value = "SOP流水号(模糊查询)", required = false) @RequestParam(required = false) String sopNo,
             @ApiParam(value = "违规工时", required = false) @RequestParam(required = false) Long days,
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+            @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TBDingCountQueryResult> resultIPage = tBDingService.query(new Page<>(pageNumber, pageSize), serviceId, status, createId, userName, supplierId, custom, sopNo, days);
 
         return ResultUtil.ok(resultIPage);

+ 3 - 3
sop-server/src/main/java/com/qmth/sop/server/api/TBQualityProblemApplyController.java

@@ -51,8 +51,8 @@ public class TBQualityProblemApplyController {
             @ApiParam(value = "质量问题编号(模糊查询) ", required = false) @RequestParam(required = false) String problemNo,
             @ApiParam(value = "提交时间开始", required = false) @RequestParam(required = false) Long startTime,
             @ApiParam(value = "提交时间结束", required = false) @RequestParam(required = false) Long endTime,
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+            @Valid @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+            @Valid @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TBQualityProblemApplyResult> resultIPage = tBQualityProblemApplyService.query(new Page<>(pageNumber, pageSize), serviceId, userId, type, reason, degree, custom, problemNo, startTime, endTime);
         return ResultUtil.ok(resultIPage);
     }
@@ -70,7 +70,7 @@ public class TBQualityProblemApplyController {
     @ApiOperation(value = "质量问题反馈表删除接口")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
-    public Result delete(@ApiParam(value = "质量问题反馈表id", required = true) @RequestParam(required = true) long[] ids) {
+    public Result delete(@Valid @ApiParam(value = "质量问题反馈表id", required = true) @RequestParam(required = true) long[] ids) {
         return ResultUtil.ok(tBQualityProblemApplyService.delete(ids));
     }
 

+ 0 - 1
sop-server/src/main/java/com/qmth/sop/server/api/TBViolationController.java

@@ -33,7 +33,6 @@ import javax.validation.constraints.Min;
 @Api(tags = "sop违规登记表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_VIOLATION)
-@Validated
 public class TBViolationController {
 
 

+ 0 - 1
sop-server/src/main/java/com/qmth/sop/server/api/TBViolationDetailController.java

@@ -35,7 +35,6 @@ import java.util.Objects;
 @Api(tags = "违规明细表 Controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX+SystemConstant.PREFIX_URL_VIOLATION_DETAIL)
-@Validated
 public class TBViolationDetailController {