修改新增用户接口的返回值

src/main/java/com/yaoxiang/diagnosis/controller/OpenController.java

@@ -2,6 +2,7 @@ package com.yaoxiang.diagnosis.controller;
 
 import com.yaoxiang.diagnosis.entity.UserInfo;
 import com.yaoxiang.diagnosis.config.Constants;
+import com.yaoxiang.diagnosis.model.Result;
 import com.yaoxiang.diagnosis.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,7 +20,7 @@ public class OpenController {
 
     @ApiOperation("注册")
     @PostMapping(value = "/user/register")
-    public Long register(@RequestBody UserInfo user) {
+    public Result register(@RequestBody UserInfo user) {
         user.setUserType(Constants.USER_TYPE_STUDENT);
         return userService.addUser(user);
     }

src/main/java/com/yaoxiang/diagnosis/controller/UserInfoController.java

@@ -45,6 +45,7 @@ public class UserInfoController {
     @GetMapping("/info")
     public UserInfo getInfo() {
         AuthUser user = SecurityUtil.getCurrentUser();
+        user.getUser().setPassword(null);
         return user.getUser();
     }
 }

src/main/java/com/yaoxiang/diagnosis/controller/UserManagerController.java

@@ -31,9 +31,9 @@ public class UserManagerController {
 
     @PostMapping(value = "/addStudent")
     @ApiOperation("新增学生用户，姓名、手机、密码、年级必填")
-    public Long addStudent(@RequestBody UserInfo user) {
+    public Result addStudent(@RequestBody UserInfo user) {
         if (StringUtils.isBlank(user.getGrade())) {
-            return -1L;
+            return Result.fail("年级为空");
         }
         user.setUserType(Constants.USER_TYPE_STUDENT);
         return userService.addUser(user);
@@ -41,14 +41,14 @@ public class UserManagerController {
 
     @PostMapping(value = "/addTeacher")
     @ApiOperation("新增教师用户 为管理员，姓名、手机、密码必填")
-    public Long addTeacher(@RequestBody UserInfo user) {
+    public Result addTeacher(@RequestBody UserInfo user) {
         user.setUserType(Constants.USER_TYPE_TEACHER);
         return userService.addUser(user);
     }
 
     @PostMapping(value = "/addAdmin")
     @ApiOperation("新增用户 为超级管理员，姓名、手机、密码必填")
-    public Long addAdmin(@RequestBody UserInfo user) {
+    public Result addAdmin(@RequestBody UserInfo user) {
         user.setUserType(Constants.USER_TYPE_ADMIN);
         return userService.addUser(user);
     }
@@ -76,6 +76,8 @@ public class UserManagerController {
     @GetMapping("listStudent")
     public List<UserInfo> listStudent(@RequestParam(required = false) String grade,
                                       @RequestParam(required = false) String username) {
-        return userService.listStudent(grade, username);
+        List<UserInfo> list =  userService.listStudent(grade, username);
+        list.forEach(u->u.setPassword(null));
+        return list;
     }
 }

src/main/java/com/yaoxiang/diagnosis/entity/UserInfo.java

@@ -1,6 +1,8 @@
 package com.yaoxiang.diagnosis.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.annotations.CreationTimestamp;
@@ -29,7 +31,6 @@ public class UserInfo implements Serializable {
     @ApiModelProperty("用户名，唯一")
     private String username;
     @Column(nullable = false)
-    @JsonIgnore
     private String password;
     @ApiModelProperty("邮箱")
     private String email;

src/main/java/com/yaoxiang/diagnosis/service/UserService.java

@@ -1,13 +1,17 @@
 package com.yaoxiang.diagnosis.service;
 
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yaoxiang.diagnosis.dao.UserRepo;
+import com.yaoxiang.diagnosis.model.Result;
 import com.yaoxiang.diagnosis.util.CommonUtil;
 import com.yaoxiang.diagnosis.util.MD5Util;
 import com.yaoxiang.diagnosis.config.Constants;
 import com.yaoxiang.diagnosis.entity.UserInfo;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
@@ -30,12 +34,18 @@ public class UserService {
     @Resource
     private RoleService roleService;
 
-    public Long addUser(UserInfo user) {
+    private static final Logger logger = LoggerFactory.getLogger(UserService.class);
+
+    public Result addUser(UserInfo user) {
         if (!checkUsername(user.getUsername())) {
-            return -1L;
+            String msg = String.format("用户名%s已存在",user.getUsername());
+            logger.error(msg);
+            return Result.fail(msg);
         }
         if (CommonUtil.hasEmpty(user.getName(), user.getUsername(), user.getPassword())) {
-            return -1L;
+            String msg = "用户名或姓名为空";
+            logger.error(msg);
+            return Result.fail(msg);
         }
    /*     if(!checkPhone(user.getPhone())){
 	        return -1L;
@@ -53,7 +63,9 @@ public class UserService {
         user.setLevel(1);
         user.setId(null);
         userRepo.save(user);
-        return user.getId();
+        logger.info("新增用户成功，username={},userType={},grade={},password=***",
+                user.getUsername(),user.getUserType(),user.getGrade());
+        return new Result(true,String.format("新增用户%s成功",user.getUsername()));
     }
 
     public List<UserInfo> listUsers(String userType) {
@@ -119,7 +131,7 @@ public class UserService {
                 return new ArrayList<>();
             }
             return new ArrayList<UserInfo>() {{
-                addUser(userInfo);
+                add(userInfo);
             }};
         }
         if (StringUtils.isBlank(grade)) {