From 3e8d7219b17e1fd565b8d51d9d2ebc610872cb2b Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 14 三月 2024 11:41:40 +0800
Subject: [PATCH] 功能调整
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 3 +--
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 2 ++
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 3 +++
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 6 ++++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index c336d0e..d4f1137 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -176,4 +176,7 @@
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
private LocalDateTime sendTime;
+ @ApiModelProperty(value = "宸ュ巶")
+ private String factory;
+
}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 02b783c..813d151 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -152,7 +152,6 @@
@GetMapping("/getUserNow")
@ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
public Result<?> getUserNow(){
- return null;
+ return Result.success(userService.getUserNow());
}
-
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index 3850536..a02b77c 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -26,4 +26,6 @@
//鑾峰彇璁惧璐熻矗浜�
List<User> getDeviceManager();
+ User getUserNow();
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 190030a..867bd57 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -74,4 +74,10 @@
public List<User> getDeviceManager() {
return userMapper.getDeviceManager();
}
+
+ @Override
+ public User getUserNow() {
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+ return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).eq(User::getIsCustom, 1).select(User::getId,User::getCompany,User::getName,User::getCode));
+ }
}
--
Gitblit v1.9.3