From 247cb86585a1d1894596ed18a6c93efecb992946 Mon Sep 17 00:00:00 2001 From: luohairen <3399054449@qq.com> Date: 星期四, 14 十一月 2024 10:34:27 +0800 Subject: [PATCH] 班级成绩图表分析 --- src/main/java/com/ycl/jxkg/controller/wx/student/UserController.java | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 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 54310c5..15fe734 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,12 +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.*; @@ -66,19 +65,15 @@ user.setStatus(UserStatusEnum.Enable.getCode()); user.setLastActiveTime(new Date()); user.setCreateTime(new Date()); - user.setDeleted(false); 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(); } @RequestMapping(value = "/update", method = RequestMethod.POST) public Result<UserResponseVO> update(@Valid UserUpdateVO model) { - if (StringUtils.isBlank(model.getBirthDay())) { - model.setBirthDay(null); - } User user = userService.getById(getCurrentUser().getId()); BeanUtils.copyProperties(model, user); user.setModifyTime(new Date()); -- Gitblit v1.8.0