Merge branch 'master' of http://42.193.1.25:9521/r/jxkg-new

zhanghua

2024-10-28 b129977dbaff2501459009577667ab11ed0163ab

Merge branch 'master' of http://42.193.1.25:9521/r/jxkg-new

 src/main/java/com/ycl/jxkg/config/spring/security/RestAuthenticationSuccessHandler.java

@@ -87,6 +87,9 @@
                UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
                userEventLog.setContent(user.getUserName() + " 登录了江西语音视频培训系统");
                eventPublisher.publishEvent(new UserEvent(userEventLog));
                // 修改用户的最后登录时间
                user.setLastActiveTime(new Date());
                userService.updateUser(user);
                UserLoginVO userLoginVO = new UserLoginVO();
                BeanUtils.copyProperties(user,userLoginVO);
                List<String> classesNames = classesUserMapper.getClassesNameByUserId(user.getId());

 src/main/java/com/ycl/jxkg/controller/admin/UserController.java

@@ -1,12 +1,12 @@
package com.ycl.jxkg.controller.admin;

import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.Classes;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.domain.other.KeyValue;
@@ -14,9 +14,7 @@
import com.ycl.jxkg.domain.vo.admin.user.*;
import com.ycl.jxkg.enums.RoleEnum;
import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserEventLogService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.*;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
@@ -27,11 +25,8 @@

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;

@@ -44,6 +39,8 @@
    private final UserEventLogService userEventLogService;
    private final AuthenticationService authenticationService;
    private final WebContext webContext;
    private final ClassesUserService classesUserService;
    private final ClassesService classesService;
    private final Integer teacher = 2;
    private final Integer student = 1;

@@ -57,6 +54,17 @@
        }
        PageInfo<User> pageInfo = userService.userPage(model);
        PageInfo<UserResponseVO> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVO.from(d));
        // 找到每个用户对应的班级
        List<UserResponseVO> list = page.getList();
        list.stream().peek(item -> {
            List<Integer> classesIds = classesUserService.getByUserId(item.getId());
            List<String> classNames = classesIds.stream().map(classesId -> {
                Classes classes = classesService.getById(classesId);
                return classes.getClassName();
            }).collect(Collectors.toList());
            item.setClassName(classNames);
        }).collect(Collectors.toList());
        page.setList(list);
        return Result.ok(page);
    }


 src/main/java/com/ycl/jxkg/domain/vo/admin/user/UserResponseVO.java

@@ -5,6 +5,8 @@
import lombok.Data;
import org.springframework.beans.BeanUtils;

import java.util.List;

@Data
public class UserResponseVO {

@@ -38,6 +40,8 @@

    private String imagePath;

    private List<String> className;

    public static UserResponseVO from(User user) {
        UserResponseVO vo = new UserResponseVO();
        BeanUtils.copyProperties(user, vo);

 src/main/java/com/ycl/jxkg/service/ClassesUserService.java

@@ -81,4 +81,12 @@
     * @return
     */
    List<StudentVO> getTeacherListByClassesId(Integer id);

    /**
     * 查询用户对应班级
     *
     * @param userId
     * @return
     */
    List<Integer> getByUserId(Integer userId);
}

 src/main/java/com/ycl/jxkg/service/impl/ClassesUserServiceImpl.java

@@ -136,6 +136,17 @@
    }

    /**
     * 根据用户id获取用户班级信息
     *
     * @param userId
     * @return
     */
    @Override
    public List<Integer> getByUserId(Integer userId) {
        return classesUserMapper.getClassesByUserId(userId);
    }

    /**
     * 修改
     *
     * @param form