reformat code
This commit is contained in:
parent
34c51c775e
commit
832ed737bf
|
|
@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.web.method.HandlerMethod;
|
import org.springframework.web.method.HandlerMethod;
|
||||||
import org.springframework.web.servlet.HandlerInterceptor;
|
import org.springframework.web.servlet.HandlerInterceptor;
|
||||||
import org.springframework.web.servlet.ModelAndView;
|
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -130,11 +129,6 @@ public class LoginInterceptor implements HandlerInterceptor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
|
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,7 @@ package com.electromagnetic.industry.software.manage.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.models.User;
|
import com.electromagnetic.industry.software.manage.pojo.models.User;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.other.PublishParam;
|
|
||||||
import com.electromagnetic.industry.software.manage.pojo.other.SearchKeyWords;
|
import com.electromagnetic.industry.software.manage.pojo.other.SearchKeyWords;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.other.UserDeleteKeyWords;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ import java.util.Date;
|
||||||
|
|
||||||
@TableName("ed_users")
|
@TableName("ed_users")
|
||||||
@Data
|
@Data
|
||||||
public class User extends BaseModel{
|
public class User extends BaseModel {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 主键ID
|
* 主键ID
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ import java.util.Date;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@TableName("ed_user_role")
|
@TableName("ed_user_role")
|
||||||
public class UserRole extends BaseModel{
|
public class UserRole extends BaseModel {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 主键ID
|
* 主键ID
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
package com.electromagnetic.industry.software.manage.pojo.other;
|
package com.electromagnetic.industry.software.manage.pojo.other;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl;
|
||||||
import cn.hutool.core.io.FileUtil;
|
import cn.hutool.core.io.FileUtil;
|
||||||
import cn.hutool.core.text.StrFormatter;
|
import cn.hutool.core.text.StrFormatter;
|
||||||
import cn.hutool.core.util.IdUtil;
|
import cn.hutool.core.util.IdUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import cn.hutool.crypto.digest.DigestUtil;
|
import cn.hutool.crypto.digest.DigestUtil;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
|
@ -73,7 +72,7 @@ public class ChatService {
|
||||||
.map(AiFileUploadRecord::getVectorId)
|
.map(AiFileUploadRecord::getVectorId)
|
||||||
.toList();
|
.toList();
|
||||||
Optional<Boolean> delete = vectorStore.delete(vectorIds);
|
Optional<Boolean> delete = vectorStore.delete(vectorIds);
|
||||||
if (delete.isPresent() && ObjectUtil.equals(delete.get(), true)) {
|
if (null != delete && delete.isPresent() && delete.get()) {
|
||||||
aiFileUploadRecordMapper.update(Wrappers.lambdaUpdate(AiFileUploadRecord.class)
|
aiFileUploadRecordMapper.update(Wrappers.lambdaUpdate(AiFileUploadRecord.class)
|
||||||
.in(AiFileUploadRecord::getId, ids)
|
.in(AiFileUploadRecord::getId, ids)
|
||||||
.set(AiFileUploadRecord::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
|
.set(AiFileUploadRecord::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
|
||||||
|
|
|
||||||
|
|
@ -4,9 +4,7 @@ import cn.hutool.core.date.DateTime;
|
||||||
import cn.hutool.core.date.SystemClock;
|
import cn.hutool.core.date.SystemClock;
|
||||||
import cn.hutool.core.lang.Assert;
|
import cn.hutool.core.lang.Assert;
|
||||||
import cn.hutool.core.text.StrFormatter;
|
import cn.hutool.core.text.StrFormatter;
|
||||||
import cn.hutool.core.util.RandomUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
|
@ -17,13 +15,21 @@ import com.electromagnetic.industry.software.common.enums.PublishEnum;
|
||||||
import com.electromagnetic.industry.software.common.exception.BizException;
|
import com.electromagnetic.industry.software.common.exception.BizException;
|
||||||
import com.electromagnetic.industry.software.common.pojo.UserLoginInfo;
|
import com.electromagnetic.industry.software.common.pojo.UserLoginInfo;
|
||||||
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
|
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
|
||||||
import com.electromagnetic.industry.software.common.util.*;
|
import com.electromagnetic.industry.software.common.util.AESUtils;
|
||||||
import com.electromagnetic.industry.software.manage.mapper.*;
|
import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.models.*;
|
import com.electromagnetic.industry.software.common.util.SignUtils;
|
||||||
|
import com.electromagnetic.industry.software.common.util.UserThreadLocal;
|
||||||
|
import com.electromagnetic.industry.software.manage.mapper.RoleMapper;
|
||||||
|
import com.electromagnetic.industry.software.manage.mapper.TokenMapper;
|
||||||
|
import com.electromagnetic.industry.software.manage.mapper.UserMapper;
|
||||||
|
import com.electromagnetic.industry.software.manage.mapper.UserMappers;
|
||||||
|
import com.electromagnetic.industry.software.manage.pojo.models.Role;
|
||||||
|
import com.electromagnetic.industry.software.manage.pojo.models.Token;
|
||||||
|
import com.electromagnetic.industry.software.manage.pojo.models.User;
|
||||||
|
import com.electromagnetic.industry.software.manage.pojo.models.UserRole;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.other.PublishParam;
|
import com.electromagnetic.industry.software.manage.pojo.other.PublishParam;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.other.SearchKeyWords;
|
import com.electromagnetic.industry.software.manage.pojo.other.SearchKeyWords;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.other.SingleUserResponse;
|
import com.electromagnetic.industry.software.manage.pojo.other.SingleUserResponse;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.other.UserDeleteKeyWords;
|
|
||||||
import com.electromagnetic.industry.software.manage.pojo.req.*;
|
import com.electromagnetic.industry.software.manage.pojo.req.*;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.resp.UserLoginResponse;
|
import com.electromagnetic.industry.software.manage.pojo.resp.UserLoginResponse;
|
||||||
import com.electromagnetic.industry.software.manage.pojo.resp.UserSearchResponse;
|
import com.electromagnetic.industry.software.manage.pojo.resp.UserSearchResponse;
|
||||||
|
|
@ -64,6 +70,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
||||||
UserLoginInfo info = UserMappers.INSTANCE.getUserLoginRequestToModel(loginRequest);
|
UserLoginInfo info = UserMappers.INSTANCE.getUserLoginRequestToModel(loginRequest);
|
||||||
String decodePwd = AESUtils.decrypt(info.getUserPwd(), UserConstants.SECRET_KEY);
|
String decodePwd = AESUtils.decrypt(info.getUserPwd(), UserConstants.SECRET_KEY);
|
||||||
User user = userMapper.selectUserByWorkNumber(info.getWorkNumber());
|
User user = userMapper.selectUserByWorkNumber(info.getWorkNumber());
|
||||||
|
if (Objects.isNull(user)) {
|
||||||
|
return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误");
|
||||||
|
}
|
||||||
info.setUserId(user.getId());
|
info.setUserId(user.getId());
|
||||||
info.setUsername(user.getUserName());
|
info.setUsername(user.getUserName());
|
||||||
info.setAdminType(user.getAdminType());
|
info.setAdminType(user.getAdminType());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue