From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改

---
 src/main/java/com/whyc/controller/UserController.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/controller/UserController.java b/src/main/java/com/whyc/controller/UserController.java
index ad48012..dd13eff 100644
--- a/src/main/java/com/whyc/controller/UserController.java
+++ b/src/main/java/com/whyc/controller/UserController.java
@@ -1,7 +1,5 @@
 package com.whyc.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.whyc.dto.Response;
 import com.whyc.pojo.UserInf;
 import com.whyc.service.UserService;
@@ -40,6 +38,11 @@
         return userService.addByRSA(user);
     }
 
+    @PostMapping("register")
+    @ApiOperation(value = "娉ㄥ唽鐢ㄦ埛")
+    public Response register(@RequestBody UserInf user){
+        return userService.registerUser(user);
+    }
     @GetMapping
     @ApiOperation(value = "鏌ヨbyId")
     public Response<UserInf> getById(@RequestParam int id){
@@ -54,16 +57,14 @@
 
     @GetMapping("page")
     @ApiOperation(value = "鏌ヨ鍒嗛〉")
-    public Response<IPage<UserInf>> getPage(@RequestParam int pageNum,int pageSize){
-        Page<Object> page = new Page<>(pageNum, pageSize);
-        return new Response<IPage<UserInf>>().set(1,userService.getAllWithPage(page));
+    public Response getPage(@RequestParam int pageNum,int pageSize){
+        return new Response().set(1,userService.getAllWithPage(pageNum,pageSize));
     }
 
     @PutMapping
     @ApiOperation(value = "缂栬緫")
     public Response update(@RequestBody UserInf user){
-        userService.update(user);
-        return new Response().setII(1,"鏇存柊鎴愬姛");
+        return userService.update(user);
     }
 
     @DeleteMapping
@@ -222,4 +223,22 @@
         return new Response().set(1,list);
     }
 
+    /**
+     * 鍛婅娲惧崟涓紝鏌ヨ绔欑偣浜哄憳淇℃伅
+     * @param stationId
+     * @return
+     */
+    @ApiOperation(tags = "鍛婅娲惧崟", value = "鏍规嵁绔欑偣鏌ヨ鐩稿叧浜哄憳", notes = "User_infAction!getUserInfoByStationId")
+    @GetMapping("getUserInfoByStationId")
+    public Response getUserInfoByStationId(@RequestParam String stationId){
+        List<UserInf> list = userService.getUserInfoByStationId(stationId);
+        return new Response().set(1,list);
+    }
+
+    @ApiOperation(value = "浼崟鐐圭櫥褰�",notes = "杩斿洖鐨刣ata涓哄竷灏斿��,鏄惁鐧诲綍鎴愬姛;data2:鐢ㄦ埛鎵�鍦ㄧ殑鏉冮檺缁刬d;data3涓虹敤鎴峰璞�,鍐呭惈灞炴�id,uname,urole")
+    @GetMapping("loginByUId")
+    public Response searchSnIdByUId(@RequestParam int uId){
+        return userService.loginByUId(uId);
+    }
+
 }

--
Gitblit v1.9.1