bug

lohir

2024-10-16 926f55cd895aa62d079ef18fee964d81bfae005e

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

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

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
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;
@@ -22,7 +20,6 @@
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
@@ -30,7 +27,8 @@

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -124,6 +122,12 @@
        }
        User user = new User();
        BeanUtils.copyProperties(model, user);
        user.setAge(model.getAge());
        try {
            user.setBirthDay(new SimpleDateFormat("yyyy-MM-dd").parse(model.getBirthDay()));
        } catch (ParseException e) {
            throw new RuntimeException(e);
        }

        if (model.getId() == null) {
            String encodePwd = authenticationService.pwdEncode(model.getPassword());
@@ -169,7 +173,7 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        userService.updateById(user);
        userService.removeById(user.getId());
        return Result.ok();
    }

@@ -181,14 +185,8 @@
    }

    @GetMapping("importTemplate")
    @SneakyThrows
    public void importTemplate(HttpServletResponse response) {
        List<UserExcelVo> list = new ArrayList<>();
        list.add(new UserExcelVo().setUserName("zhangSan").setPassword("123456").setRealName("张三").setSex(1).setRole(1).setPhone("12345678901").setAge(24).setBirthDay("2000-01-01"));
        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), UserExcelVo.class).build();
        WriteSheet writeSheet = EasyExcel.writerSheet(0, "用户信息").build();
        excelWriter.write(list, writeSheet);
        excelWriter.finish();
        userService.importTemplate(response);
    }

    @PostMapping("import")