From 08c9b1a489ae7a0471dca619f86115505a4e78ff Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 17 六月 2024 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java
index 9d5a5ef..af7ecde 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/UserTokenServiceImpl.java
@@ -1,13 +1,14 @@
package com.ycl.jxkg.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.config.property.SystemConfig;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.domain.UserToken;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.entity.UserToken;
import com.ycl.jxkg.mapper.UserTokenMapper;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.UserTokenService;
import com.ycl.jxkg.utils.DateTimeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -15,26 +16,19 @@
import java.util.UUID;
@Service
-public class UserTokenServiceImpl extends BaseServiceImpl<UserToken> implements UserTokenService {
+@RequiredArgsConstructor
+public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken> implements UserTokenService {
private final UserTokenMapper userTokenMapper;
private final UserService userService;
private final SystemConfig systemConfig;
-
- @Autowired
- public UserTokenServiceImpl(UserTokenMapper userTokenMapper, UserService userService, SystemConfig systemConfig) {
- super(userTokenMapper);
- this.userTokenMapper = userTokenMapper;
- this.userService = userService;
- this.systemConfig = systemConfig;
- }
@Override
@Transactional
public UserToken bind(User user) {
user.setModifyTime(new Date());
- userService.updateByIdFilter(user);
+ userService.updateById(user);
return insertUserToken(user);
}
@@ -64,18 +58,18 @@
userToken.setCreateTime(startTime);
userToken.setEndTime(endTime);
userToken.setUserName(user.getUserName());
- userService.updateByIdFilter(user);
- userTokenMapper.insertSelective(userToken);
+ userService.updateById(user);
+ userTokenMapper.insert(userToken);
return userToken;
}
@Override
public void unBind(UserToken userToken) {
- User user = userService.selectById(userToken.getUserId());
+ User user = userService.getById(userToken.getUserId());
user.setModifyTime(new Date());
user.setWxOpenId(null);
userService.updateById(user);
- userTokenMapper.deleteByPrimaryKey(userToken.getId());
+ userTokenMapper.deleteById(userToken.getId());
}
}
--
Gitblit v1.8.0