♻️ 重构

eiam-openapi/src/main/java/cn/topiam/employee/openapi/converter/account/UserConverter.java

@@ -27,18 +27,16 @@ import org.mapstruct.Mapping;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import cn.topiam.employee.common.constant.CommonConstants;
 import cn.topiam.employee.common.entity.account.UserDetailEntity;
 import cn.topiam.employee.common.entity.account.UserEntity;
 import cn.topiam.employee.common.entity.account.po.UserPO;
-import cn.topiam.employee.common.entity.app.AppEntity;
-import cn.topiam.employee.common.repository.app.AppRepository;
 import cn.topiam.employee.openapi.pojo.result.account.UserListResult;
 import cn.topiam.employee.openapi.pojo.result.account.UserResult;
 import cn.topiam.employee.openapi.pojo.save.account.UserCreateParam;
 import cn.topiam.employee.openapi.pojo.update.account.UserUpdateParam;
 import cn.topiam.employee.support.context.ApplicationContextHelp;
 import cn.topiam.employee.support.repository.page.domain.Page;
+import static cn.topiam.employee.support.util.ImageAvatarUtils.getRandomAvatar;
 import static cn.topiam.employee.support.util.PhoneNumberUtils.getPhoneAreaCode;
 import static cn.topiam.employee.support.util.PhoneNumberUtils.getPhoneNumber;
 
@@ -110,7 +108,7 @@ public interface UserConverter {
         userEntity.setNickName(param.getNickName());
         userEntity.setLastUpdatePasswordTime(LocalDateTime.now());
         userEntity.setStatus(cn.topiam.employee.common.enums.UserStatus.ENABLE);
-        userEntity.setAvatar(CommonConstants.getRandomAvatar());
+        userEntity.setAvatar(getRandomAvatar());
         userEntity.setDataOrigin(cn.topiam.employee.common.enums.DataOrigin.INPUT);
         userEntity.setExpireDate(
             Objects.isNull(param.getExpireDate()) ? java.time.LocalDate.of(2116, 12, 31)
@@ -231,19 +229,4 @@ public interface UserConverter {
     @Mapping(target = "dataOrigin", source = "dataOrigin.code")
     UserListResult userPoConvertToUserListResult(UserPO po);
 
-    /**
-     * 获取应用名称
-     *
-     * @param targetId {@link String}
-     * @return {@link String}
-     */
-    private String getAppName(String targetId) {
-        if (!StringUtils.hasText(targetId)) {
-            return null;
-        }
-        AppRepository repository = ApplicationContextHelp.getBean(AppRepository.class);
-        AppEntity app = repository.findById(Long.valueOf(targetId)).orElse(new AppEntity());
-        return app.getName();
-    }
-
 }

eiam-openapi/src/main/java/cn/topiam/employee/openapi/service/account/impl/UserServiceImpl.java

@@ -22,6 +22,7 @@ import java.time.LocalDate;
 import java.util.*;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Example;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,13 +30,11 @@ import org.springframework.transaction.annotation.Transactional;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
-import com.querydsl.core.types.dsl.BooleanExpression;
 
 import cn.topiam.employee.audit.context.AuditContext;
 import cn.topiam.employee.audit.entity.Target;
 import cn.topiam.employee.audit.enums.TargetType;
 import cn.topiam.employee.common.entity.account.OrganizationMemberEntity;
-import cn.topiam.employee.common.entity.account.QUserEntity;
 import cn.topiam.employee.common.entity.account.UserDetailEntity;
 import cn.topiam.employee.common.entity.account.UserEntity;
 import cn.topiam.employee.common.entity.account.po.UserPO;
@@ -330,7 +329,6 @@ public class UserServiceImpl implements UserService {
         if (StringUtils.isEmpty(value)) {
             return true;
         }
-        QUserEntity user = QUserEntity.userEntity;
         UserEntity entity = new UserEntity();
         boolean result = false;
         // ID存在说明是修改操作，查询一下当前数据
@@ -347,10 +345,10 @@ public class UserServiceImpl implements UserService {
                 }
                 Phonenumber.PhoneNumber phoneNumber = PhoneNumberUtil.getInstance().parse(value,
                     "CN");
-                BooleanExpression eq = user.phone
+
-                    .eq(String.valueOf(phoneNumber.getNationalNumber()))
+                result = !userRepository.exists(Example
-                    .and(user.phoneAreaCode.eq(String.valueOf(phoneNumber.getCountryCode())));
+                    .of(new UserEntity().setPhone(String.valueOf(phoneNumber.getNationalNumber()))
-                result = !userRepository.exists(eq);
+                        .setPhoneAreaCode(String.valueOf(phoneNumber.getCountryCode()))));
             } catch (NumberParseException e) {
                 log.error("校验手机号发生异常", e);
                 throw new OpenApiException(OpenApiStatus.MOBILE_NOT_VALID);
@@ -361,16 +359,14 @@ public class UserServiceImpl implements UserService {
             if (StringUtils.equals(entity.getEmail(), value)) {
                 return true;
             }
-            BooleanExpression eq = user.email.eq(value);
+            result = !userRepository.exists(Example.of(new UserEntity().setEmail(value)));
-            result = !userRepository.exists(eq);
         }
         //用户名
         if (CheckValidityType.USERNAME.equals(type)) {
             if (StringUtils.equals(entity.getUsername(), value)) {
                 return true;
             }
-            BooleanExpression eq = user.username.eq(value);
+            result = !userRepository.exists(Example.of(new UserEntity().setUsername(value)));
-            result = !userRepository.exists(eq);
         }
         return result;
     }