|
@@ -1,9 +1,12 @@
|
|
|
package com.om.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.collection.ListUtil;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.om.constant.RedisConstant;
|
|
|
import com.om.entity.dto.UserLoginDTO;
|
|
|
import com.om.entity.po.User;
|
|
|
+import com.om.entity.vo.UserAddVO;
|
|
|
import com.om.entity.vo.UserLoginVO;
|
|
|
import com.om.exception.BadReqException;
|
|
|
import com.om.mapper.UserMapper;
|
|
@@ -11,6 +14,7 @@ import com.om.service.IUserService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.om.utils.JwtUtils;
|
|
|
import com.om.utils.Result;
|
|
|
+import com.om.utils.UserContext;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -18,6 +22,7 @@ import org.springframework.util.DigestUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
@@ -38,6 +43,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
@Resource
|
|
|
private RedisTemplate redisTemplate;
|
|
|
|
|
|
+ @Resource
|
|
|
+ UserMapper userMapper;
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
//TODO
|
|
|
public Result login(UserLoginDTO dto) {
|
|
@@ -97,4 +106,96 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
|
|
|
return Result.ok(userLoginVO);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result add(UserAddVO user) {
|
|
|
+ User addUser = new User();
|
|
|
+ BeanUtil.copyProperties(user,addUser);
|
|
|
+ if (addUser.getUsername()==null || addUser.getPassword() == null ){
|
|
|
+ return Result.error();
|
|
|
+ }
|
|
|
+ this.save(addUser);
|
|
|
+ //差保存维修厂的公司
|
|
|
+
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result delete(Integer id) {
|
|
|
+ if (id == null){
|
|
|
+ return Result.error();
|
|
|
+ }
|
|
|
+ boolean deleteById = this.removeById(id);
|
|
|
+ if (deleteById == false){
|
|
|
+ return Result.error();
|
|
|
+ }
|
|
|
+ return Result.ok();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result getListByUserId(Integer userId) {
|
|
|
+
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result getPageList(UserAddVO user) {
|
|
|
+
|
|
|
+ List<User> userList = userMapper.selectList(null);
|
|
|
+ if (user.getPageIndex() <=0 || user.getPageSize()<=0 || userList == null){
|
|
|
+ return Result.error();
|
|
|
+ }
|
|
|
+ List<User> list = ListUtil.page(user.getPageIndex(), user.getPageSize(), userList);
|
|
|
+ return Result.ok(list);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result getByUserId(Integer userId) {
|
|
|
+ User user = this.getById(userId);
|
|
|
+ if (user == null){
|
|
|
+ return Result.error();
|
|
|
+ }
|
|
|
+
|
|
|
+ return Result.ok(user);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result relieve() {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result updateState(User user) {
|
|
|
+ Integer userId = UserContext.getUserId();
|
|
|
+
|
|
|
+ User selectUser = getById(userId);
|
|
|
+ selectUser.setState(user.getState());
|
|
|
+ userMapper.update(selectUser,null);
|
|
|
+
|
|
|
+ return Result.ok();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result updateType(User user) {
|
|
|
+ if (user.getUserType()==null){
|
|
|
+ return Result.error();
|
|
|
+ }
|
|
|
+ Integer userId = UserContext.getUserId();
|
|
|
+ User selectUser = getById(userId);
|
|
|
+ selectUser.setUserType(user.getUserType());
|
|
|
+ userMapper.update(selectUser,null);
|
|
|
+ return Result.ok();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Result updateUserInfo(UserAddVO user) {
|
|
|
+ Integer userId = UserContext.getUserId();
|
|
|
+ User userById = getById(userId);
|
|
|
+ BeanUtil.copyProperties(user,userById);
|
|
|
+ userById.setId(userId);
|
|
|
+
|
|
|
+ return Result.ok();
|
|
|
+ }
|
|
|
}
|