From 610d8b9c9fc3ade5e495c97b3b48bb6a8719f71f Mon Sep 17 00:00:00 2001 From: wanghb <17803890193@163.com> Date: Thu, 10 Aug 2023 10:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=BC=82=E5=B8=B8=E5=92=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=9F=E4=B8=80=E7=BB=93=E6=9E=9C=E9=9B=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/controller/CourseController.java | 23 +++--- .../service/impl/CourseServiceImpl.java | 39 ++++------ .../{course => utils}/common/JsonResult.java | 18 ++--- .../zhiyun/zhiyun03/utils/common/Result.java | 76 ------------------- .../exception/GlobalExceptionHandler.java | 14 ++-- 5 files changed, 41 insertions(+), 129 deletions(-) rename src/main/java/com/zhiyun/zhiyun03/{course => utils}/common/JsonResult.java (64%) delete mode 100644 src/main/java/com/zhiyun/zhiyun03/utils/common/Result.java diff --git a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java index 4722483..e52020f 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java @@ -1,13 +1,13 @@ package com.zhiyun.zhiyun03.course.controller; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.zhiyun.zhiyun03.course.common.JsonResult; + import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.service.CourseService; import com.zhiyun.zhiyun03.course.vo.CourseVo; import com.zhiyun.zhiyun03.course.vo.PageVO; + +import com.zhiyun.zhiyun03.utils.common.JsonResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -28,18 +28,19 @@ public class CourseController { @ApiOperation("查询课程") @GetMapping("/selectAll") - public List queryCourse(){ + public JsonResult queryCourse(){ List lists = courseService.queryCourse(); - return lists; + + return JsonResult.success(lists); } @ApiOperation("课程添加") @PostMapping("/add") - public String addCourse(Course course){ + public JsonResult addCourse(Course course){ courseService.addCourse(course); - return "success"; + return JsonResult.success(); } // //// @ApiOperation("查询目录") @@ -51,16 +52,16 @@ public class CourseController { // @ApiOperation("删除课程") @DeleteMapping("delById") - public String delCourseById(Integer id){ + public JsonResult delCourseById(Integer id){ courseService.delCourseById(id); - return "success"; + return JsonResult.success(); } @ApiOperation("更新课程") @PostMapping("update") - public String updateById(Course course){ + public JsonResult updateById(Course course){ courseService.update(course); - return "success"; + return JsonResult.success(); } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java index 996834b..13e573b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java @@ -59,29 +59,34 @@ public class CourseServiceImpl extends ServiceImpl implemen } - + /** + * 添加课程 + */ @Override public void addCourse(Course course) { courseMapper.insert(course); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("id",course.getDirId()); - directoryMapper.update(null,updateWrapper); +// UpdateWrapper updateWrapper = new UpdateWrapper<>(); +// updateWrapper.set("id",course.getDirId()); +// directoryMapper.update(null,updateWrapper); } + /** + * 删除课程 + */ @Override public void delCourseById(Integer id) { courseMapper.deleteById(id); } + /** + * 课程更新 + */ @Override public void update(Course course) { //变更数据进行更新 - - - UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("course_name",course.getCourseName()); updateWrapper.set("course_brief",course.getCourseBrief()); @@ -92,23 +97,5 @@ public class CourseServiceImpl extends ServiceImpl implemen courseMapper.update(null,updateWrapper); } -// @Override -// public void delCourseById(Integer id) { -// courseDAO.deleteByPrimaryKey(id); -// } -// -// @Override -// public void updateById(Course course) { -// courseDAO.updateByPrimaryKey(course); -// } -// -// @Override -// public List queryCourse() { -// return null; -// } -// -// @Override -// public List selectAll() { -// return courseDAO.selectAll(); -// } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/common/JsonResult.java b/src/main/java/com/zhiyun/zhiyun03/utils/common/JsonResult.java similarity index 64% rename from src/main/java/com/zhiyun/zhiyun03/course/common/JsonResult.java rename to src/main/java/com/zhiyun/zhiyun03/utils/common/JsonResult.java index f0702fd..5c17099 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/common/JsonResult.java +++ b/src/main/java/com/zhiyun/zhiyun03/utils/common/JsonResult.java @@ -1,28 +1,28 @@ -package com.zhiyun.zhiyun03.course.common; +package com.zhiyun.zhiyun03.utils.common; import lombok.Data; @Data public class JsonResult { - private Integer code; + private String code; private String msg; private T data; - private Long count; - public static JsonResult ok() { + + public static JsonResult success() { JsonResult jsonResult = new JsonResult(); - jsonResult.setCode(200);//code值是自行定义 + jsonResult.setCode("200");//code值是自行定义 jsonResult.setMsg("success"); return jsonResult; } - public static JsonResult ok(T data) { + public static JsonResult success(T data) { JsonResult jsonResult = new JsonResult(); - jsonResult.setCode(200);//code值是自行定义 + jsonResult.setCode("200");//code值是自行定义 jsonResult.setMsg("success"); jsonResult.setData(data); return jsonResult; @@ -31,13 +31,13 @@ public class JsonResult { public static JsonResult error() { JsonResult jsonResult = new JsonResult(); - jsonResult.setCode(500); + jsonResult.setCode("500"); jsonResult.setMsg("fail"); return jsonResult; } - public static JsonResult error(int code, String msg) { + public static JsonResult error(String code, String msg) { JsonResult jsonResult = new JsonResult(); jsonResult.setCode(code); diff --git a/src/main/java/com/zhiyun/zhiyun03/utils/common/Result.java b/src/main/java/com/zhiyun/zhiyun03/utils/common/Result.java deleted file mode 100644 index 4827bc2..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/utils/common/Result.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.zhiyun.zhiyun03.utils.common; - -import lombok.Data; - -@Data -public class Result { - -//返回信息码 -private String code; -//返回信息 -private String msg; -//返回数据 -T data; - -public Result(){} - -public Result(T data){ - this.data=data; -} - - -//成功，只返回成功码和信息 -public Result success(){ - Result result=new Result<>(); - result.setCode(ResultCode.SUCCESS.code); - result.setMsg(ResultCode.SUCCESS.msg); - return result; -} - -//成功，返回成功码、信息和数据 -public Result success(T data){ - Result result=new Result(); - result.setCode(ResultCode.SUCCESS.code); - result.setMsg(ResultCode.SUCCESS.msg); - result.setData(data); - return result; -} - -//失败，返回自己定义的信息码和信息 -public Result error(){ - Result result=new Result<>(); - result.setCode(ResultCode.ERROR.code); - result.setMsg(ResultCode.ERROR.code); - return result; -} - -//失败，返回controller层传过来信息码和信息 -public Result error(String code,String msg){ - Result result=new Result<>(); - result.setCode(code); - result.setMsg(msg); - return result; -} - - -public void setCode(String code){ - this.code=code; -} - -public void setMsg(String msg){ - this.msg=msg; -} - -public void setData(T data){ - this.data=data; -} - -@Override -public String toString() { - return "Result{" + - "code='" + code + '\'' + - ", msg='" + msg + '\'' + - ", data=" + data + - '}'; -} -} diff --git a/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java b/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java index f853d53..5166940 100644 --- a/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/zhiyun/zhiyun03/utils/exception/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ package com.zhiyun.zhiyun03.utils.exception; -import com.zhiyun.zhiyun03.utils.common.Result; +import com.zhiyun.zhiyun03.utils.common.JsonResult; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; public class GlobalExceptionHandler { @ExceptionHandler(ServiceException.class) - public Result serviceExceptionHandler(ServiceException e) { + public JsonResult serviceExceptionHandler(ServiceException e) { log.error("异常信息", e); - Result result = new Result<>(); - return result.error(e.getCode(), e.getMsg()); + + return JsonResult.error(e.getCode(), e.getMsg()); } @ExceptionHandler(Exception.class) - public Result exceptionHandler(Exception e) { + public JsonResult exceptionHandler(Exception e) { log.error("未知异常", e); - Result result = new Result<>(); - return result.error("500", "未知异常，请联系管理员"); + + return JsonResult.error("500", "未知异常，请联系管理员"); } }