增加返回状态枚举类

src/main/java/com/imed/costaccount/common/util/Result.java

@@ -2,6 +2,8 @@ package com.imed.costaccount.common.util;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.imed.costaccount.enums.ResultCodeEnum;
+import org.springframework.util.StringUtils;
 
 /**
  * 统一封装返回对象
@@ -9,12 +11,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class Result {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
-
     // 响应业务状态
-    private Integer status;
+     private Integer code;
+
+     private Integer status;
 
     // 响应消息
-    private String msg;
+     private String msg;
 
     // 响应中的数据
     private Object data;
@@ -25,11 +28,20 @@ public class Result {
     public static Result build(Integer status, String msg, Object data) {
         return new Result(status, msg, data);
     }
+    public static Result build(ResultCodeEnum codeEnum, Object data) {
+        Integer code = codeEnum.getCode();
+        String msg=codeEnum.getMessage();
+        return new Result(code, msg, data);
+    }
 
     public static Result build(Integer status, String msg, Object data, String ok) {
         return new Result(status, msg, data, ok);
     }
 
+//    public static Result ok(ResultCodeEnum codeEnum, Object data) {
+//        return new Result(codeEnum, data);
+//    }
+
     public static Result ok(Object data) {
         return new Result(data);
     }

src/main/java/com/imed/costaccount/enums/ResultCodeEnum.java

@@ -0,0 +1,60 @@
+package com.imed.costaccount.enums;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.enums
+ * @date 2021-07-26 15:12
+ */
+public enum  ResultCodeEnum {
+
+    SUCCESS(200, "返回成功", "Return Success"),
+    UPDATE_INSERT_SUCCESS(201,"新建或修改数据成功","Return Success"),
+    ASYNCHRONOUS_TASKS(202,"一个请求已经进入后台排队（异步任务）"),
+    DELETE_SUCCESS(203,"删除数据成功"),
+
+    FAIL(500, "返回失败", "Return Failed"),
+    ILLEGAL_ARGUMENT(400, "非法参数", "Illegal Argument"),
+    UNAUTHORIZED(401, "认证失败", "Unauthorized"),
+    FORBIDDEN(403, "登陆失效", "Forbidden"),
+    URL_NOT_FOUND(404,"路径不存在"),
+    METHOD_NOT_ALLOW(405,"请求方法不被允许"),
+    REQUEST_FORMAT(406,"请求的格式不可得"),
+    TOKEN_EXPIRED(410, "访问令牌已过期", "Token Expired"),
+    USER_NOT_FOUND(411, "用户不存在"),
+    USERPASSWORD_NOT_BLANK(412, "用户名密码不正确"),
+    HOSPITAL_NOT_FOUND(413, "医院不存在"),
+    USER_NOT_SYS(414, "用户没有系统权限"),
+    USER_ADD_EXCEPTION(422,"当创建一个对象时，发生一个验证错误"),
+    SERVER_ERROR(500,"服务器异常"),
+    GATEWAY_ERROR(502,"网关错误"),
+    SERVICE_NOT_USE(503,"服务不可用"),
+    GATEWAY_TIMEOUT(504,"网关超时"),
+    ERROR(999, "系统异常", "System Exception");
+
+    private final Integer code;
+    private final String message;
+    private String enMessage = "";
+
+    private ResultCodeEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    private ResultCodeEnum(Integer code, String message, String enMessage) {
+        this.code = code;
+        this.message = message;
+        this.enMessage = enMessage;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public String getEnMessage() {
+        return this.enMessage;
+    }
+}

src/main/java/com/imed/costaccount/model/vo/UserVO.java

@@ -16,6 +16,8 @@ import lombok.*;
 @Builder
 @ApiModel
 public class UserVO {
+    @ApiModelProperty(name = "id",value = "用户的Id")
+    private String id;
     @ApiModelProperty(name = "name",value = "用户姓名")
     private String name;
     @ApiModelProperty(name = "account",value = "账号")

src/main/java/com/imed/costaccount/service/HosptailService.java

@@ -1,6 +1,7 @@
 package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.Hosptail;
 import com.imed.costaccount.model.vo.CommonVO;
 
@@ -29,5 +30,13 @@ public interface HosptailService extends IService<Hosptail> {
      * @return
      */
     Hosptail getBySign(String hospSign);
+
+    /**
+     * 分页查询所有的医院信息
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    PageUtils queryList(Integer page, Integer pageSize);
 }
 

src/main/java/com/imed/costaccount/service/UserService.java

@@ -35,7 +35,7 @@ public interface UserService extends IService<User> {
      * @param hospId
      * @return
      */
-    PageUtils queryList(Integer page, Integer pageSize, Integer hospId);
+    PageUtils queryList(Integer page, Integer pageSize, Integer hospId,String name);
 
     /**
      * 根据用户的姓名查询用户

src/main/java/com/imed/costaccount/service/impl/HosptailServiceImpl.java

@@ -2,10 +2,14 @@ package com.imed.costaccount.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.HosptailMapper;
 import com.imed.costaccount.model.Hosptail;
+import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.vo.CommonVO;
+import com.imed.costaccount.model.vo.UserVO;
 import com.imed.costaccount.service.HosptailService;
 import com.imed.costaccount.utils.BeanUtil;
 import org.springframework.stereotype.Service;
@@ -21,6 +25,23 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service("hosptailService")
 public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> implements HosptailService {
 
+    /**
+     * 分页查询所有的医院信息
+     *
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public PageUtils queryList(Integer page, Integer pageSize) {
+//        Page<Hosptail> hosptailPage = new Page<>(page, pageSize);
+//        Page<Hosptail> pages = this.page(hosptailPage);
+//        List<UserVO> userVOS = com.imed.costaccount.common.util.BeanUtil.convertList(records, UserVO.class);
+//        PageUtils pageUtils = new PageUtils(pages);
+//        pageUtils.setList(userVOS);
+//        return pageUtils;
+        return null;
+    }
 
     /**
      * 通过医院标识获取院区列表
@@ -63,4 +84,6 @@ public class HosptailServiceImpl extends ServiceImpl<HosptailMapper, Hosptail> i
         }
         return one;
     }
+
+
 }

src/main/java/com/imed/costaccount/service/impl/UserServiceImpl.java

@@ -92,9 +92,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * @return
      */
     @Override
-    public PageUtils queryList(Integer page, Integer pageSize, Integer hospId) {
+    public PageUtils queryList(Integer page, Integer pageSize, Integer hospId,String name) {
         Page<User> userPage = new Page<>(page, pageSize);
-        Page<User> pages = this.page(userPage, new QueryWrapper<User>().lambda().eq(User::getHospId, hospId));
+        Page<User> pages = this.page(userPage, new QueryWrapper<User>().lambda().eq(User::getHospId, hospId).like(!StringUtils.isEmpty(name),User::getName,name));
         List<User> records = pages.getRecords();
         List<UserVO> userVOS = BeanUtil.convertList(records, UserVO.class);
         PageUtils pageUtils = new PageUtils(pages);
@@ -111,8 +111,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public List<UserVO> getByUserName(String name) {
         QueryWrapper<User> wrapper = new QueryWrapper<>();
-        wrapper.like(!StringUtils.isEmpty(name),"name",name);
-        List<User> users = baseMapper.selectList(wrapper);
+        List<User> users = baseMapper.selectList(new QueryWrapper<User>().lambda().like(!StringUtils.isEmpty(name),User::getName,name));
         List<UserVO> userVOS = BeanUtil.convertList(users, UserVO.class);
         return userVOS;
     }
@@ -147,8 +146,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public void updateByUser(UserDto userDto) {
         QueryWrapper<User> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",userDto.getId());
-        User user = baseMapper.selectOne(wrapper);
+        User user = baseMapper.selectOne(new QueryWrapper<User>().lambda().like(!StringUtils.isEmpty(userDto.getId()),User::getId,userDto.getId()));
         if (Objects.isNull(user)) {
             throw new CostException("用户不存在");
         }

src/main/java/com/imed/costaccount/web/HosptailController.java

@@ -7,7 +7,9 @@ import java.util.Map;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.Hosptail;
+import com.imed.costaccount.model.User;
 import com.imed.costaccount.service.HosptailService;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,9 +42,10 @@ public class HosptailController {
     @GetMapping("/list")
     public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
+//       TODO  User user = (User) SecurityUtils.getSubject().getPrincipal();  没有token
 
-        List<Hosptail> hosptailList = hosptailService.list();
-        return Result.ok(hosptailList);
+        PageUtils pageUtils = hosptailService.queryList(page,pageSize);
+        return Result.ok(pageUtils);
     }
 
     /**

src/main/java/com/imed/costaccount/web/UserController.java

@@ -5,16 +5,20 @@ import java.util.List;
 
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
+import com.imed.costaccount.enums.ResultCodeEnum;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.UserDto;
 import com.imed.costaccount.model.vo.UserVO;
 import com.imed.costaccount.service.UserService;
+import io.swagger.annotations.ApiModel;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
+import static com.imed.costaccount.enums.ResultCodeEnum.UPDATE_INSERT_SUCCESS;
+
 /**
  * 用户表
  *
@@ -34,10 +38,12 @@ public class UserController {
      * @return
      */
     @GetMapping("/list")
+
     public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
-                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
-        User user = (User) SecurityUtils.getSubject().getPrincipal();
-        PageUtils pageUtils = userService.queryList(page,pageSize,user.getHospId());
+                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                       @RequestParam(value = "name",required = false) String name){
+//        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        PageUtils pageUtils = userService.queryList(page,pageSize,1,name);
         return Result.ok(pageUtils);
     }