From da52a1ba7e8fc2d8e633655484e7ff4abed319c8 Mon Sep 17 00:00:00 2001 From: 安瑾然 <107107765@qq.com> Date: 星期二, 12 七月 2022 09:28:42 +0800 Subject: [PATCH] commit --- src/main/java/com/example/jz/config/DefaultExceptionHandlerConfig.java | 13 +++--- src/main/java/com/example/jz/modle/entity/R.java | 71 +++++++++++++++++++++++++++++++++++ src/main/java/com/example/jz/enums/BusinessHttpStatus.java | 5 ++ src/main/java/com/example/jz/exception/BusinessException.java | 4 +- src/main/java/com/example/jz/controller/AnnouncementController.java | 15 +++---- 5 files changed, 91 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/example/jz/config/DefaultExceptionHandlerConfig.java b/src/main/java/com/example/jz/config/DefaultExceptionHandlerConfig.java index c153ac9..f61d378 100644 --- a/src/main/java/com/example/jz/config/DefaultExceptionHandlerConfig.java +++ b/src/main/java/com/example/jz/config/DefaultExceptionHandlerConfig.java @@ -2,6 +2,7 @@ import com.example.jz.enums.BusinessHttpStatus; import com.example.jz.exception.BusinessException; +import com.example.jz.modle.entity.R; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -19,21 +20,21 @@ @ExceptionHandler(BindException.class) - public ResponseEntity<String> bindExceptionHandler(BindException e) { + public R<String> bindExceptionHandler(BindException e) { e.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getBindingResult().getFieldErrors().get(0).getDefaultMessage()); + return R.failed(e.getBindingResult().getFieldErrors().get(0).getDefaultMessage()); } @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity<String> methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) { + public R<String> methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) { e.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getBindingResult().getFieldErrors().get(0).getDefaultMessage()); + return R.failed(e.getBindingResult().getFieldErrors().get(0).getDefaultMessage()); } @ExceptionHandler(BusinessException.class) - public ResponseEntity<String> unauthorizedExceptionHandler(BusinessException e) { + public R<String> unauthorizedExceptionHandler(BusinessException e) { e.printStackTrace(); - return ResponseEntity.status(e.getHttpStatusCode()).body(e.getMessage()); + return R.failed(e.getMessage()); } } diff --git a/src/main/java/com/example/jz/controller/AnnouncementController.java b/src/main/java/com/example/jz/controller/AnnouncementController.java index 8de6c43..4c09abe 100644 --- a/src/main/java/com/example/jz/controller/AnnouncementController.java +++ b/src/main/java/com/example/jz/controller/AnnouncementController.java @@ -2,11 +2,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.api.ApiController; -import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.example.jz.modle.entity.Announcement; +import com.example.jz.modle.entity.R; import com.example.jz.service.AnnouncementService; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,8 +35,8 @@ * @return 鎵�鏈夋暟鎹� */ @GetMapping - public ResponseEntity<Page<Announcement>> selectAll(Page<Announcement> page, Announcement announcement) { - return ResponseEntity.ok(this.announcementService.page(page, new QueryWrapper<>(announcement))); + public R<Page<Announcement>> selectAll(Page<Announcement> page, Announcement announcement) { + return R.ok(this.announcementService.page(page, new QueryWrapper<>(announcement))); } /** @@ -48,7 +47,7 @@ */ @GetMapping("{id}") public R selectOne(@PathVariable Serializable id) { - return success(this.announcementService.getById(id)); + return R.ok(this.announcementService.getById(id)); } /** @@ -59,7 +58,7 @@ */ @PostMapping public R insert(@RequestBody Announcement announcement) { - return success(this.announcementService.save(announcement)); + return R.ok(this.announcementService.save(announcement)); } /** @@ -70,7 +69,7 @@ */ @PutMapping public R update(@RequestBody Announcement announcement) { - return success(this.announcementService.updateById(announcement)); + return R.ok(this.announcementService.updateById(announcement)); } /** @@ -81,7 +80,7 @@ */ @DeleteMapping public R delete(@RequestParam("idList") List<Long> idList) { - return success(this.announcementService.removeByIds(idList)); + return R.ok(this.announcementService.removeByIds(idList)); } } diff --git a/src/main/java/com/example/jz/enums/BusinessHttpStatus.java b/src/main/java/com/example/jz/enums/BusinessHttpStatus.java index acb2208..975f63d 100644 --- a/src/main/java/com/example/jz/enums/BusinessHttpStatus.java +++ b/src/main/java/com/example/jz/enums/BusinessHttpStatus.java @@ -3,7 +3,10 @@ public enum BusinessHttpStatus { // 鏈櫥褰� - UNAUTHORIZED(401, "鏈巿鏉�"); + UNAUTHORIZED(401, "鏈櫥褰�"), + BAD_EXCEPTION(10000, "绯荤粺寮傚父"), + // 鎴愬姛 + SUCCESS(200, "鎴愬姛"); private final int value; diff --git a/src/main/java/com/example/jz/exception/BusinessException.java b/src/main/java/com/example/jz/exception/BusinessException.java index f4780b1..13df96e 100644 --- a/src/main/java/com/example/jz/exception/BusinessException.java +++ b/src/main/java/com/example/jz/exception/BusinessException.java @@ -3,7 +3,7 @@ import com.example.jz.enums.BusinessHttpStatus; import org.springframework.http.HttpStatus; -public class BusinessException extends RuntimeException{ +public class BusinessException extends RuntimeException { /** * @@ -35,7 +35,7 @@ public BusinessException(String msg) { super(msg); - this.httpStatusCode = HttpStatus.BAD_REQUEST.value(); + this.httpStatusCode = BusinessHttpStatus.BAD_EXCEPTION.value(); } diff --git a/src/main/java/com/example/jz/modle/entity/R.java b/src/main/java/com/example/jz/modle/entity/R.java new file mode 100644 index 0000000..df5dfac --- /dev/null +++ b/src/main/java/com/example/jz/modle/entity/R.java @@ -0,0 +1,71 @@ +package com.example.jz.modle.entity; + +import com.example.jz.enums.BusinessHttpStatus; +import lombok.*; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 鍝嶅簲淇℃伅涓讳綋 + * + * @param <T> + * @author lengleng + */ +@ToString +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +public class R<T> implements Serializable { + + private static final long serialVersionUID = 1L; + + @Getter + @Setter + private int code; + + @Getter + @Setter + private String msg; + + @Getter + @Setter + private T data; + + public static <T> R<T> ok() { + return restResult(null, BusinessHttpStatus.SUCCESS.value(), null); + } + + public static <T> R<T> ok(T data) { + return restResult(data, BusinessHttpStatus.SUCCESS.value(), null); + } + + public static <T> R<T> ok(T data, String msg) { + return restResult(data, BusinessHttpStatus.SUCCESS.value(), msg); + } + + public static <T> R<T> failed() { + return restResult(null, BusinessHttpStatus.BAD_EXCEPTION.value(), null); + } + + public static <T> R<T> failed(String msg) { + return restResult(null, BusinessHttpStatus.BAD_EXCEPTION.value(), msg); + } + + public static <T> R<T> failed(T data) { + return restResult(data, BusinessHttpStatus.BAD_EXCEPTION.value(), null); + } + + public static <T> R<T> failed(T data, String msg) { + return restResult(data, BusinessHttpStatus.BAD_EXCEPTION.value(), msg); + } + + private static <T> R<T> restResult(T data, int code, String msg) { + R<T> apiResult = new R<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; + } + +} \ No newline at end of file -- Gitblit v1.8.0