From 9a0e8ff39f5075668448544c6a6181735cd7d5ec Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 07 七月 2023 16:33:31 +0800
Subject: [PATCH] 增加请求“获取指定用户id的用户信息和企业信息”
---
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 5 ++
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 12 ++++++
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 13 ++++++
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 32 +++++++++++++++
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java | 8 ++++
user-server/src/main/resources/mapper/UserMapper.xml | 8 +++
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 5 ++
7 files changed, 78 insertions(+), 5 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index 5bb5aca..c729023 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -1,13 +1,24 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.pojo.Enterprise;
+import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.UserService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -15,6 +26,25 @@
*/
@RestController
@RequestMapping("/user")
+@Api(tags = "鐢ㄦ埛妯″潡")
public class UserController {
+ @Autowired
+ private UserService userService;
+
+ @PostMapping("/getUserById")
+ @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛id鐨勭敤鎴蜂俊鎭拰浼佷笟淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "鐢ㄦ埛id", name = "userId", dataTypeClass = Integer.class, required = true)
+ })
+ public Result<?> getUserById(int userId) {
+ Map<String, String> map = userService.selectUserByUserId(userId);
+ User user = new User(map.get("account"),map.get("uname"),map.get("phone"),map.get("email"),map.get("info"));
+ Enterprise enterprise = new Enterprise(map.get("name"),map.get("byname"),map.get("link_name"),map.get("link_phone"));
+ Map map1 = new HashMap<>();
+ map1.put("enterprise", enterprise);
+ map1.put("user", user);
+ return Result.success(map1);
+ }
+
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index ba21890..a0b0e21 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -2,6 +2,9 @@
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
/**
* <p>
@@ -12,5 +15,5 @@
* @since 2023-07-07
*/
public interface UserMapper extends BaseMapper<User> {
-
+ Map<String, String> selectUserByUserId(int userId);
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
index 175ba92..001c438 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
/**
* <p>
@@ -18,6 +19,7 @@
* @since 2023-07-07
*/
@Data
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Enterprise瀵硅薄", description="")
public class Enterprise implements Serializable {
@@ -56,4 +58,10 @@
private Integer version;
+ public Enterprise(String name, String byname, String linkName, String linkPhone) {
+ this.name = name;
+ this.byname = byname;
+ this.linkName = linkName;
+ this.linkPhone = linkPhone;
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index 34f3d2f..d6962c8 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -8,6 +8,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
/**
* <p>
@@ -18,6 +19,7 @@
* @since 2023-07-07
*/
@Data
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="User瀵硅薄", description="")
public class User implements Serializable {
@@ -49,6 +51,9 @@
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0")
private Integer jobState;
+ @ApiModelProperty(value = "涓�х鍚�")
+ private String info;
+
private LocalDateTime createTime;
private LocalDateTime updateTime;
@@ -58,5 +63,11 @@
@ApiModelProperty(value = "鍏宠仈 瑙掕壊id")
private Integer roleId;
-
+ public User(String account, String name, String phone, String email, String info) {
+ this.account = account;
+ this.name = name;
+ this.phone = phone;
+ this.email = email;
+ this.info = info;
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index ff42a44..0a148ba 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -3,6 +3,8 @@
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Map;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -12,5 +14,6 @@
* @since 2023-07-07
*/
public interface UserService extends IService<User> {
-
+// 閫氳繃鐢ㄦ埛id鑾峰彇鐢ㄦ埛淇℃伅
+ Map<String, String> selectUserByUserId(int userId);
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 6cf6e1f..024c82b 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -4,7 +4,12 @@
import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
/**
* <p>
@@ -17,4 +22,11 @@
@Service
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+ @Resource
+ UserMapper userMapper;
+
+ @Override
+ public Map<String, String> selectUserByUserId(int userId) {
+ return userMapper.selectUserByUserId(userId);
+ }
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index b18997b..675a282 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.UserMapper">
-
+ <select id="selectUserByUserId" parameterType="int" resultType="Map">
+ select u.account account,u.name uname,u.phone,u.email,u.info,e.byname,e.`name`,e.link_name,e.link_phone
+ from enterprise_user_list el,enterprise e,`user` u
+ where e.id = el.enterprise_id
+ and el.user_id = u.id
+ and u.id = #{userId}
+ </select>
</mapper>
--
Gitblit v1.9.3