From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
index ecad45c..e9d023e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
@@ -1,14 +1,16 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
/**
* <p>
@@ -18,9 +20,26 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@Api(tags = "妫�楠屾ā鍧�-->鍒嗛厤璁″垝-->妫�楠岄」鐩�")
@RestController
@RequestMapping("/inspection-product-list")
public class InspectionProductListController {
+ @Resource
+ UserService userService;
+ @ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
+ @GetMapping("/selectUser")
+ public Result selectUser() {
+ return Result.success(userService.selectUser());
+ }
+
+ @ApiOperation("閫夋嫨璇曢獙鍛樹俊鎭�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鐢ㄦ埛ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectUserById")
+ public Result selectUserById(Integer id) {
+ return Result.success(userService.selectByUserId(id));
+ }
}
--
Gitblit v1.9.3