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 | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserController.java b/src/main/java/com/whyc/controller/UserController.java
index f601586..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;
@@ -28,18 +26,23 @@
@Resource
private UserService userService;
- @PostMapping
- @ApiOperation(value = "娣诲姞")
- public Response add(@RequestBody UserInf user){
- return userService.add(user);
- }
+ //@PostMapping
+ //@ApiOperation(value = "娣诲姞")
+ //public Response add(@RequestBody UserInf user){
+ // return userService.add(user);
+ //}
- @PostMapping("/addByRSA")
+ @PostMapping
@ApiOperation(value = "娣诲姞-RSA鍔犲瘑")
public Response addByRSA(@RequestBody UserInf user){
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
@@ -212,6 +213,32 @@
return new Response().setII(1,"瑙ｉ攣鎴愬姛");
}
+ /**
+ * 鍖呮満缁勯噸鍋氾紙绌挎妗嗭級鏌ヨ鎵�鏈夌殑鐢ㄦ埛-鏇存柊涓烘煡璇㈡湭琚坊鍔犲埌鏉冮檺缁勭殑鎵�鏈夌敤鎴�
+ */
+ @ApiOperation(value = "鍖呮満缁勯噸鍋氾紙绌挎妗嗭級鏌ヨ鎵�鏈夌殑鐢ㄦ埛")
+ @GetMapping("searchCS_All2")
+ public Response searchCS_All2(){
+ List<UserInf> list = userService.searchCS_All2();
+ 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