From 9784433b1404acb3232f2b27eb621bd57428c1b6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 09 八月 2023 17:51:50 +0800
Subject: [PATCH] 不合格反馈与不合格评审
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 8 deletions(-)
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 7f6d726..744ad7e 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
@@ -1,18 +1,24 @@
package com.yuanchu.limslaboratory.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.User;
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 com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
+import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-
-import javax.annotation.Resource;
/**
* <p>
@@ -26,19 +32,104 @@
public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
@Resource
- UserMapper userMapper;
+ private UserMapper userMapper;
+
+ @Override
+ public Map<String, Object> getUserInfo(String token) {
+ //鏍规嵁token鑾峰彇鐢ㄦ埛淇℃伅
+ Object obj = RedisUtil.get(token);
+ if (!ObjectUtils.isEmpty(obj)){
+ Map loginUser = (Map) obj;
+ Map map = (Map)loginUser.get("data");
+ Object residualTime = map.get("residualTime");
+ int i = Integer.parseInt(residualTime.toString());
+ String remind = null;
+ if (i <= 30) {
+ remind = "鎮ㄦ墍浣跨敤鐨勭郴缁熷嵆灏嗚繃鏈燂紒璇疯仈绯荤鐞嗗憳锛�";
+ }
+ Map<String, Object> data = new HashMap<>();
+ data.put("name",loginUser.get("name"));
+ data.put("remind", remind);
+ return data;
+ }
+ return null;
+ }
+
+ @Override
+ public Boolean userIsNull(Integer Id) {
+ LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ userLambdaQueryWrapper.eq(User::getId, Id);
+ userLambdaQueryWrapper.select(User::getName);
+ User user = userMapper.selectOne(userLambdaQueryWrapper);
+ return !ObjectUtils.isEmpty(user);
+ }
+
+ @Override
+ public String selectByUserId(Integer userId) {
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(User::getId, userId);
+ wrapper.select(User::getName);
+ User user = userMapper.selectOne(wrapper);
+ return user.getName();
+ }
+
+ @Override
+ public List<Map> selectUser() {
+ return userMapper.selectUser();
+ }
+
+ @Override
+ public List<Map<String, Object>> getUserNameAndId() {
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(User::getId, User::getName);
+ return userMapper.selectMaps(wrapper);
+ }
@Override
public Map<String, String> selectUserByUserId(int userId) {
return userMapper.selectUserByUserId(userId);
}
- @Resource
- private UserMapper mapper;
@Override
public User AccordingUsernameSelectAll(String account) {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(User::getAccount, account);
- return mapper.selectOne(wrapper);
+ wrapper.select(User::getPassword, User::getId, User::getName, User::getAccount, User::getEnterpriseId);
+ return userMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {
+ User user = new User()
+ .setName(newPersonnelVo.getName())
+ .setAccount(newPersonnelVo.getAccount())
+ .setAge(newPersonnelVo.getAge())
+ .setPhone(newPersonnelVo.getPhone())
+ .setEmail(newPersonnelVo.getEmail())
+ .setRoleId(newPersonnelVo.getRole_id())
+ .setPassword(newPersonnelVo.getPassword())
+ .setEnterpriseId(Integer.valueOf(enterpriseId));
+ return userMapper.insert(user);
+ }
+
+ @Override
+ public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
+ User user = new User()
+ .setName(updatePersonnelVo.getName())
+ .setAccount(updatePersonnelVo.getAccount())
+ .setAge(updatePersonnelVo.getAge())
+ .setPhone(updatePersonnelVo.getPhone())
+ .setEmail(updatePersonnelVo.getEmail())
+ .setRoleId(updatePersonnelVo.getRole_id())
+ .setPassword(updatePersonnelVo.getPassword())
+ .setJobState(updatePersonnelVo.getJobState());
+ LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(User::getId, updatePersonnelVo.getId());
+ return userMapper.update(user, updateWrapper);
+ }
+
+ @Override
+ public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page) {
+ return userMapper.getNewPersonnelPage(name, page);
}
}
--
Gitblit v1.9.3