blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
fuliqi
2024-10-17 8546b3d285af4235a0ef615a0c6e89486ae2c806 
 src/main/java/com/ycl/jxkg/controller/admin/UserController.java


@@ -1,31 +1,30 @@


package com.ycl.jxkg.controller.admin;




import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;


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.form.UpdatePwdForm;


import com.ycl.jxkg.enums.RoleEnum;


import com.ycl.jxkg.domain.other.KeyValue;


import com.ycl.jxkg.domain.entity.User;


import com.ycl.jxkg.domain.entity.UserEventLog;


import com.ycl.jxkg.enums.UserStatusEnum;


import com.ycl.jxkg.domain.other.KeyValue;


import com.ycl.jxkg.domain.vo.StudentVO;


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.utils.DateTimeUtil;


import com.ycl.jxkg.domain.vo.admin.user.*;


import com.ycl.jxkg.utils.PageInfoHelper;


import com.github.pagehelper.PageInfo;




import lombok.RequiredArgsConstructor;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.BeanUtils;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;




import javax.servlet.http.HttpServletResponse;


import javax.validation.Valid;


import java.util.Date;


import java.util.List;


@@ -176,7 +175,15 @@


        return Result.ok(keyValues);


    }




    @GetMapping("importTemplate")


    public void importTemplate(HttpServletResponse response) {


        userService.importTemplate(response);


    }




    @PostMapping("import")


    public Result<String> importExcel(MultipartFile file) {


        return Result.ok(userService.importExcel(file));


    }






}