文件调整

xiangpei

2024-06-03 9014ae6e56a419d8cffa8376641726705c87a77d

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

@@ -3,21 +3,20 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.UserEventLog;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.domain.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.vo.admin.user.*;
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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
@@ -93,7 +92,6 @@
            user.setUserUuid(UUID.randomUUID().toString());
            user.setCreateTime(new Date());
            user.setLastActiveTime(new Date());
            user.setDeleted(false);
            userService.insertUser(user);
        } else {
            if (!StringUtils.isBlank(model.getPassword())) {
@@ -132,7 +130,6 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        user.setDeleted(true);
        userService.updateById(user);
        return Result.ok();
    }