From 9797dca8f3a12c0e72942b8043c1b225bde2bbaf Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 16:26:02 +0800
Subject: [PATCH] feat：题目导入
---
src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
index 85d23c5..376026c 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java
@@ -2,12 +2,12 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.controller.wx.BaseWXApiController;
-import com.ycl.jxkg.domain.Message;
-import com.ycl.jxkg.domain.MessageUser;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.domain.UserEventLog;
-import com.ycl.jxkg.domain.enums.RoleEnum;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
+import com.ycl.jxkg.domain.entity.Message;
+import com.ycl.jxkg.domain.entity.MessageUser;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.entity.UserEventLog;
+import com.ycl.jxkg.enums.RoleEnum;
+import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.MessageService;
@@ -15,11 +15,11 @@
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
-import com.ycl.jxkg.vo.student.user.*;
+import com.ycl.jxkg.domain.vo.student.user.*;
import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -30,7 +30,7 @@
import java.util.UUID;
import java.util.stream.Collectors;
-
+@RequiredArgsConstructor
@Controller("WXStudentUserController")
@RequestMapping(value = "/api/wx/student/user")
@ResponseBody
@@ -41,15 +41,6 @@
private final MessageService messageService;
private final AuthenticationService authenticationService;
private final ApplicationEventPublisher eventPublisher;
-
- @Autowired
- public UserController(UserService userService, UserEventLogService userEventLogService, MessageService messageService, AuthenticationService authenticationService, ApplicationEventPublisher eventPublisher) {
- this.userService = userService;
- this.userEventLogService = userEventLogService;
- this.messageService = messageService;
- this.authenticationService = authenticationService;
- this.eventPublisher = eventPublisher;
- }
@RequestMapping(value = "/current", method = RequestMethod.POST)
public Result<UserResponseVO> current() {
@@ -74,10 +65,9 @@
user.setStatus(UserStatusEnum.Enable.getCode());
user.setLastActiveTime(new Date());
user.setCreateTime(new Date());
- user.setDeleted(false);
- userService.insertByFilter(user);
+ userService.insertUser(user);
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
- userEventLog.setContent("娆㈣繋 " + user.getUserName() + " 娉ㄥ唽鏉ュ埌瀛︿箣鎬濆紑婧愯�冭瘯绯荤粺");
+ userEventLog.setContent("娆㈣繋 " + user.getUserName() + " 娉ㄥ唽鏉ュ埌姹熻タ绌虹闊宠棰戝煿璁郴缁�");
eventPublisher.publishEvent(new UserEvent(userEventLog));
return Result.ok();
}
@@ -87,10 +77,10 @@
if (StringUtils.isBlank(model.getBirthDay())) {
model.setBirthDay(null);
}
- User user = userService.selectById(getCurrentUser().getId());
+ User user = userService.getById(getCurrentUser().getId());
BeanUtils.copyProperties(model, user);
user.setModifyTime(new Date());
- userService.updateByIdFilter(user);
+ userService.updateUser(user);
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
userEventLog.setContent(user.getUserName() + " 鏇存柊浜嗕釜浜鸿祫鏂�");
eventPublisher.publishEvent(new UserEvent(userEventLog));
--
Gitblit v1.8.0