ljx преди 4 години
родител
ревизия
4abbd6882f

+ 0 - 69
src/main/java/com/imed/costaccount/common/exception/ExceptionHandle.java

@@ -1,69 +0,0 @@
-package com.imed.costaccount.common.exception;
-
-import com.imed.costaccount.common.constants.CommonConstant;
-import com.imed.costaccount.common.util.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.dao.DataAccessException;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.converter.HttpMessageConversionException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * 自定义异常信息
- * TODO 建议加上@ResponseStatus
- */
-@ControllerAdvice
-@Slf4j
-public class ExceptionHandle {
-
-    @ResponseBody
-    @ExceptionHandler(value = MethodArgumentNotValidException.class)
-    public Result handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
-        String msg = e.getBindingResult().getFieldError().getField() + CommonConstant.SEPARATOR_NUMBER + e.getBindingResult().getFieldError().getDefaultMessage();
-        log.error("参数校验失败:[{}]", msg);
-        return Result.errorMsg(500, msg);
-    }
-
-    @ResponseBody
-    @ExceptionHandler(value = MissingServletRequestParameterException.class)
-    public Result handleMethodArgumentNotValidException(MissingServletRequestParameterException e) {
-        log.error("参数校验失败:[{}]", e.getParameterName());
-        return Result.errorMsg(500, "参数错误" + CommonConstant.SEPARATOR_NUMBER + e.getParameterName());
-    }
-
-    @ResponseBody
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    @ExceptionHandler(value = HttpMessageConversionException.class)
-    public Result handleMissingServletRequestParameter(HttpMessageConversionException e) {
-        log.error("参数解析异常:{}", e.getMessage());
-        return Result.errorMsg(500, "参数解析异常");
-    }
-
-    @ExceptionHandler(value = CostException.class)
-    @ResponseBody
-    public Result handleCostException(CostException e) {
-        log.error("自定义异常:{}", e.getMessage(), e);
-        return Result.errorMsg(e.getMessage());
-    }
-
-    @ExceptionHandler(DataAccessException.class)
-    @ResponseBody
-    public Result handleDataAccessException(DataAccessException e) {
-        log.error("数据库错误:{}", e.getMessage(), e);
-        return Result.errorMsg("数据库错误");
-
-    }
-
-    @ExceptionHandler(Exception.class)
-    @ResponseBody
-    public Result handleException(Exception e) {
-        log.error("系统异常:{}", e.getMessage(), e);
-        return Result.errorMsg("系统异常");
-    }
-
-}

+ 0 - 64
src/main/java/com/imed/costaccount/controller/response/CommonResponse.java

@@ -1,64 +0,0 @@
-package com.imed.costaccount.controller.response;
-
-import com.imed.costaccount.common.config.exception.BusinessException;
-import com.imed.costaccount.enums.ResponseCodeEnum;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class CommonResponse<T> implements Serializable {
-    private static final long serialVersionUID = 3978461145132490879L;
-
-    private String code;// 返回码
-
-    private String msg;// 返回消息
-
-    private T data;// 数据源
-
-    public CommonResponse(String code, String msg, T data) {
-        this.code = code;
-        this.msg = msg;
-        this.data = data;
-    }
-
-    public CommonResponse(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public CommonResponse(ResponseCodeEnum responseCodeEnum) {
-        this.code = responseCodeEnum.getCode();
-        this.msg = responseCodeEnum.getMessage();
-    }
-
-    public CommonResponse(BusinessException exception) {
-        this.code = exception.getCode();
-        this.msg = exception.getMessage();
-    }
-
-    public static <T> CommonResponse success(T data) {
-        return new CommonResponse<>(ResponseCodeEnum.SUCCESS.getCode(),
-                ResponseCodeEnum.SUCCESS.getMessage(), data);
-    }
-
-    public static <T> CommonResponse success(T data, String msg) {
-        return new CommonResponse<>(ResponseCodeEnum.SUCCESS.getCode(), msg, data);
-    }
-
-    public static CommonResponse success() {
-        return success(null);
-    }
-
-    public static <T> CommonResponse error(String msg) {
-        return new CommonResponse<>(ResponseCodeEnum.FAIL.getCode(), msg, null);
-    }
-
-    public static <T> CommonResponse error(String code, String msg) {
-        return new CommonResponse<>(code, msg, null);
-    }
-
-    public static <T> CommonResponse error(String code, String msg, T data) {
-        return new CommonResponse<>(code, msg, data);
-    }
-}

+ 2 - 0
src/main/java/com/imed/costaccount/model/User.java

@@ -1,6 +1,7 @@
 package com.imed.costaccount.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
@@ -58,6 +59,7 @@ public class User implements Serializable {
 	/**
 	 * 删除时间,如果存在表示已删除13位时间戳
 	 */
+	@TableLogic
 	private Long deleteTime;
 
 }

+ 1 - 1
src/main/java/com/imed/costaccount/controller/LoginController.java → src/main/java/com/imed/costaccount/web/LoginController.java

@@ -1,4 +1,4 @@
-package com.imed.costaccount.controller;
+package com.imed.costaccount.web;
 
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.dto.LoginDTO;

+ 12 - 13
src/main/java/com/imed/costaccount/controller/UserController.java → src/main/java/com/imed/costaccount/web/UserController.java

@@ -1,11 +1,10 @@
-package com.imed.costaccount.controller;
+package com.imed.costaccount.web;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.imed.costaccount.common.util.PageUtils;
-import com.imed.costaccount.controller.response.CommonResponse;
+import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,45 +32,45 @@ public class UserController {
 //    }
 
     @GetMapping("/list")
-    public CommonResponse list(){
+    public Result list(){
         List<User> userList = userService.list();
-        return CommonResponse.success(userList);
+        return Result.ok(userList);
     }
 
     /**
      * 信息
      */
     @GetMapping("/info/{id}")
-    public CommonResponse info(@PathVariable("id") Integer id){
+    public Result info(@PathVariable("id") Integer id){
 		User user = userService.getById(id);
-        return CommonResponse.success(user);
+        return Result.ok(user);
     }
 
     /**
      * 保存
      */
     @PostMapping("/save")
-    public CommonResponse save(@RequestBody User user){
+    public Result save(@RequestBody User user){
 		userService.save(user);
-        return CommonResponse.success();
+        return Result.ok();
     }
 
     /**
      * 修改
      */
     @PutMapping("/update")
-    public CommonResponse update(@RequestBody User user){
+    public Result update(@RequestBody User user){
 		userService.updateById(user);
-        return CommonResponse.success();
+        return Result.ok();
     }
 
     /**
      * 删除
      */
     @DeleteMapping("/delete")
-    public CommonResponse delete(@RequestBody Integer[] ids){
+    public Result delete(@RequestBody Integer[] ids){
 		userService.removeByIds(Arrays.asList(ids));
-        return CommonResponse.success();
+        return Result.ok();
     }
 
 }