From 832ed737bf704b17fa1640c2ed805168512c9f33 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 22 Apr 2025 09:26:36 +0800 Subject: [PATCH] reformat code --- .../manage/config/LoginInterceptor.java | 6 ------ .../software/manage/mapper/UserMapper.java | 2 -- .../software/manage/pojo/models/User.java | 6 +++--- .../software/manage/pojo/models/UserRole.java | 2 +- .../manage/pojo/other/SingleUserResponse.java | 2 -- .../service/serviceimpl/ChatService.java | 3 +-- .../service/serviceimpl/UserServiceImpl.java | 21 +++++++++++++------ 7 files changed, 20 insertions(+), 22 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java index 9405527..cfbebaf 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java @@ -27,7 +27,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; import java.util.Date; 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 public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java index f0afc3c..e0d7210 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/UserMapper.java @@ -2,9 +2,7 @@ package com.electromagnetic.industry.software.manage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.UserDeleteKeyWords; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java index 2eff60a..bd343c9 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/User.java @@ -13,13 +13,13 @@ import java.util.Date; @TableName("ed_users") @Data -public class User extends BaseModel{ +public class User extends BaseModel { /** * 主键ID */ private String id; - + /** * 用户姓名 */ @@ -89,7 +89,7 @@ public class User extends BaseModel{ * 盐 */ private String salt; - + public void newInit() { String id = IdWorker.getSnowFlakeIdString(); String userId = UserThreadLocal.getUserId(); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java index f390a50..fb7b65a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserRole.java @@ -11,7 +11,7 @@ import java.util.Date; @Data @TableName("ed_user_role") -public class UserRole extends BaseModel{ +public class UserRole extends BaseModel { /** * 主键ID diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java index 41aa98d..a7f2906 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/SingleUserResponse.java @@ -1,7 +1,5 @@ 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.JsonProperty; import lombok.Data; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java index 1955f32..0cab5ad 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java @@ -3,7 +3,6 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.StrFormatter; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -73,7 +72,7 @@ public class ChatService { .map(AiFileUploadRecord::getVectorId) .toList(); Optional 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) .in(AiFileUploadRecord::getId, ids) .set(AiFileUploadRecord::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java index 6cd4b55..bc69976 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java @@ -4,9 +4,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.SystemClock; import cn.hutool.core.lang.Assert; 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.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; 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.pojo.UserLoginInfo; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; -import com.electromagnetic.industry.software.common.util.*; -import com.electromagnetic.industry.software.manage.mapper.*; -import com.electromagnetic.industry.software.manage.pojo.models.*; +import com.electromagnetic.industry.software.common.util.AESUtils; +import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil; +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.SearchKeyWords; 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.resp.UserLoginResponse; import com.electromagnetic.industry.software.manage.pojo.resp.UserSearchResponse; @@ -64,6 +70,9 @@ public class UserServiceImpl extends ServiceImpl implements Us UserLoginInfo info = UserMappers.INSTANCE.getUserLoginRequestToModel(loginRequest); String decodePwd = AESUtils.decrypt(info.getUserPwd(), UserConstants.SECRET_KEY); User user = userMapper.selectUserByWorkNumber(info.getWorkNumber()); + if (Objects.isNull(user)) { + return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误"); + } info.setUserId(user.getId()); info.setUsername(user.getUserName()); info.setAdminType(user.getAdminType());