From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 17 十月 2024 21:01:37 +0800 Subject: [PATCH] 达梦不支持value改为values --- src/main/java/com/ycl/jxkg/controller/admin/UserController.java | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java index 18e9c42..deac41d 100644 --- a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java +++ b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java @@ -1,29 +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.domain.form.UpdatePwdForm; -import com.ycl.jxkg.enums.RoleEnum; -import com.ycl.jxkg.domain.other.KeyValue; +import com.ycl.jxkg.base.SystemCode; +import com.ycl.jxkg.context.WebContext; 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; @@ -38,9 +39,17 @@ private final UserService userService; private final UserEventLogService userEventLogService; private final AuthenticationService authenticationService; - + private final WebContext webContext; + private final Integer teacher = 2; + private final Integer student = 1; @RequestMapping(value = "/page/list", method = RequestMethod.POST) public Result<PageInfo<UserResponseVO>> pageList(@RequestBody UserPageRequestVO model) { + if(!student.equals(model.getRole())) { + User currentUser = webContext.getCurrentUser(); + if (teacher.equals(currentUser.getRole())) { + return Result.fail(SystemCode.InnerError.getCode(), "鎮ㄦ病鏈夎闂潈闄�"); + } + } PageInfo<User> pageInfo = userService.userPage(model); PageInfo<UserResponseVO> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVO.from(d)); return Result.ok(page); @@ -166,10 +175,14 @@ return Result.ok(keyValues); } - @PostMapping("/update/password") - public Result<Object> updatePassword(@RequestBody @Validated UpdatePwdForm form) { - userService.updatePassword(form); - return Result.ok("淇敼鎴愬姛"); + @GetMapping("importTemplate") + public void importTemplate(HttpServletResponse response) { + userService.importTemplate(response); + } + + @PostMapping("import") + public Result<String> importExcel(MultipartFile file) { + return Result.ok(userService.importExcel(file)); } -- Gitblit v1.8.0