wyc

src/main/java/com/zhentao/shouye/controller/UserShouyeController.java

@@ -24,4 +24,11 @@ public class UserShouyeController {
         System.err.println(userShouyeDto);
         return userShouyeService.findAll(userShouyeDto);
     }
+
+    @PostMapping("add")
+    @NullLogin
+    public Result add(@RequestHeader("token") String token,@RequestBody UserShouyeDto userShouyeDto){
+        String userIdFromToken = TokenUtils.getUserIdFromToken(token);
+        return userShouyeService.add(userIdFromToken,userShouyeDto);
+    }
 }

src/main/java/com/zhentao/shouye/service/UserShouyeService.java

@@ -12,4 +12,5 @@ import com.zhentao.vo.Result;
 */
 public interface UserShouyeService extends IService<UserShouye> {
     Result findAll(UserShouyeDto dto);
+    Result add(String uid1,UserShouyeDto dto);
 }

src/main/java/com/zhentao/shouye/service/impl/UserShouyeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zhentao.shouye.service.impl;
 
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhentao.groups.mapper.GroupsMapper;
@@ -64,6 +65,29 @@ public class UserShouyeServiceImpl extends ServiceImpl<UserShouyeMapper, UserSho
         System.err.println(list);
         return Result.OK(list,  "查询成功");
     }
+
+    @Override
+    public Result add(String uid1,UserShouyeDto dto) {
+
+        QueryWrapper<UserShouye> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("uid1", uid1);
+        queryWrapper.eq("uid2", dto.getUid1());
+        UserShouye one = this.getOne(queryWrapper);
+        if (one==null){
+            UserShouye userShouye = new UserShouye();
+            long l = IdUtil.getSnowflake(1, 1).nextId();
+            userShouye.setId(l);
+            userShouye.setUid1(Long.valueOf(uid1));
+            userShouye.setUid2(dto.getUid1());
+            userShouye.setStatus(0);
+            this.save(userShouye);
+            return Result.OK(null, "添加成功");
+        }else {
+            return Result.OK(null, "已存在");
+        }
+
+
+    }
 }
 
 

src/main/java/com/zhentao/user/controller/UserController.java

@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -147,12 +148,17 @@ public class UserController {
     @GetMapping("getUserById")
     @NullLogin
     public Result getUserById(@RequestHeader("token") String token) {
-        String userIdFromToken = TokenUtils.getUserIdFromToken(token);
-        UserLogin userById = userLoginService.getUserById(Long.valueOf(userIdFromToken));
-        System.err.println(userById);
-        return Result.OK(userById, "查询成功");
+            String userIdFromToken = TokenUtils.getUserIdFromToken(token);
+            UserLogin userById = userLoginService.getUserById(Long.valueOf(userIdFromToken));
+            return Result.OK(userById, "查询成功");
+    }
+    @PostMapping("getUser")
+    @NullLogin
+    public Result getUser(@RequestBody UserInfo userInfo) {
+        System.err.println(userInfo);
+        UserLogin byId = userLoginService.getById(userInfo.getUserId());
+        return Result.OK(byId, "查询成功");
     }
-
     //查询好有-搜索
     @GetMapping("searchFriends")
     @NullLogin

src/main/java/com/zhentao/userRelationships/dto/FriendsTDto.java

@@ -1,9 +1,12 @@
 package com.zhentao.userRelationships.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
 
 @Data
 public class FriendsTDto {
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long friendId;       // 好友ID
     private String nickName;     // 好友昵称
     private String avatar;       // 好友头像

src/main/java/com/zhentao/userRelationships/dto/UserRelationshipsDto.java

@@ -1,10 +1,11 @@
 package com.zhentao.userRelationships.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 @Data
 public class UserRelationshipsDto {
-
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userId;
 
     private String remark;