common工程修改

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/controller/PigController.java

@@ -6,9 +6,10 @@ import com.huimv.apiservice.service.PigService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.common.utils.R;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import java.util.Map;
 import java.util.Objects;
@@ -20,6 +21,7 @@ import java.util.Objects;
 @CrossOrigin
 @RestController
 @RequestMapping("/pig")
+@Validated
 public class PigController {
 
     @Autowired
@@ -35,7 +37,7 @@ public class PigController {
     //@Limit(key = "pig_getPigInfo",name = "pig/getPigInfo",prefix = "apiservice")
     @GetMapping("/getPigInfo")
     public R getPigInfo(@RequestParam(value = "accessToken") String accessToken,
-                        @RequestParam("pigEarTagNo") String pigEarTagNo) {
+                        @NotBlank(message = "耳标号不能为空!") @RequestParam("pigEarTagNo")  String pigEarTagNo) {
         Map<String, Object> map = pigService.getPigInfoByEarTagNo(pigEarTagNo);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", map);
     }
@@ -50,7 +52,7 @@ public class PigController {
      */
     @GetMapping("/getImage")
     public R getImage(@RequestParam(value = "accessToken") String accessToken,
-                      @Valid @NotBlank @RequestParam("pigEarTagNo") String pigEarTagNo) {
+                      @NotBlank(message = "耳标号111不能为空!") @RequestParam("pigEarTagNo")  String pigEarTagNo) {
         PigImageVo pigImageVo = pigService.getImageByEarTagNo(pigEarTagNo);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", pigImageVo);
     }
@@ -64,7 +66,7 @@ public class PigController {
      */
     @GetMapping("/getListByBreed")
     public R getListByBreed(@RequestParam(value = "accessToken") String accessToken,
-                            @RequestParam("breedName") String breedName) {
+                            @RequestParam("breedName") @NotBlank(message = "品种名称不能为空!") String breedName) {
         PageUtils page = pigService.getListByBreed(breedName);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("page", page);
     }
@@ -78,7 +80,7 @@ public class PigController {
      */
     @GetMapping("/getIndoorEnv")
     public R getIndoorEnv(@RequestParam(value = "accessToken") String accessToken,
-                          @RequestParam("pigEarTagNo") String pigEarTagNo) {
+                          @NotBlank(message = "耳标号不能为空!") @RequestParam("pigEarTagNo") String pigEarTagNo) {
         EnvVo envVo = pigService.getIndoorEnv(pigEarTagNo);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("data", envVo);
     }
@@ -92,7 +94,7 @@ public class PigController {
      */
     @GetMapping("/adopt")
     public R adopt(@RequestParam(value = "accessToken") String accessToken,
-                   @RequestParam("pigEarTagNo") String pigEarTagNo) {
+                   @RequestParam("pigEarTagNo") @NotBlank(message = "耳标号不能为空!") String pigEarTagNo) {
         pigService.adopt(pigEarTagNo);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("msg", "认养成功!");
     }
@@ -106,7 +108,7 @@ public class PigController {
      */
     @GetMapping("/outFence")
     public R outFence(@RequestParam(value = "accessToken", required = false) String accessToken,
-                      @RequestParam("pigEarTagNo") String pigEarTagNo,
+                      @RequestParam("pigEarTagNo") @NotBlank(message = "耳标号不能为空!") String pigEarTagNo,
                       @RequestParam("status") Integer status) {
         pigService.outFence(pigEarTagNo,status);
         return Objects.requireNonNull(R.ok().put("code", 1000)).put("msg", "更新出栏状态成功!");

huimv-smart-apiservice/src/main/java/com/huimv/apiservice/service/impl/PigServiceImpl.java

@@ -273,7 +273,7 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
     }
 
     @Override
-    public void outFence(String pigEarTagNo, Integer status) {
+    public void  outFence(String pigEarTagNo, Integer status) {
 
         checkPigEarTagNo(pigEarTagNo);
 
@@ -295,6 +295,11 @@ public class PigServiceImpl extends ServiceImpl<PigDao, YearPigBaseEntity> imple
      * @param pigEarTagNo 耳标号
      */
     private void checkPigEarTagNo(String pigEarTagNo) {
+
+//        if (StringUtils.isEmpty(pigEarTagNo)) {
+//            throw new RRException("耳标号不能为空!", 1001);
+//        }
+
         Integer count = baseMapper.selectCount(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, pigEarTagNo));
         if (count <= 0) {
             throw new RRException("耳标信息不存在,请检查!", 1001);

huimv-smart-common/src/main/java/com/huimv/common/exception/RRExceptionHandler.java

@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
+import javax.validation.ConstraintViolationException;
+
 /**
  * 异常处理器
  *
@@ -69,8 +71,7 @@ public class RRExceptionHandler {
 	//当校验失败时，会抛出MethodArgumentNotValidException
 	//输出错误原因到前端
 	@ExceptionHandler(MethodArgumentNotValidException.class)
-	@ResponseBody
-	public R binding(MethodArgumentNotValidException ex) {
+	public R handleMethodArgumentNotValidException(MethodArgumentNotValidException ex) {
 		StringBuilder sb = new StringBuilder();
 		for(ObjectError error : ex.getBindingResult().getAllErrors()){
 			if(error instanceof FieldError){
@@ -81,6 +82,14 @@ public class RRExceptionHandler {
 		return R.error(1001,sb.toString());
 	}
 
+	@ExceptionHandler(ConstraintViolationException.class)
+	public R handleConstraintViolationException(ConstraintViolationException e) {
+		logger.error(e.getMessage(),e);
+		StringBuilder sb = new StringBuilder();
+		e.getConstraintViolations().forEach(constraintViolation -> sb.append(constraintViolation.getMessage()).append(" "));
+		return R.error(1001,sb.toString().substring(0,sb.length() - 1));
+	}
+
 	@ExceptionHandler(Exception.class)
 	public R handleException(Exception e){
 		logger.error(e.getMessage(), e);