From 7217438afbb87067d015cc57f985e8c43d68ecaf Mon Sep 17 00:00:00 2001 From: xiwa Date: Fri, 3 Nov 2023 23:10:03 +0800 Subject: [PATCH] fix:bug#I8DLHU --- .../java/cc/iotkit/data/dao/IJPACommData.java | 30 ++++++++++--------- .../iotkit/data/service/SysUserDataImpl.java | 10 +++---- .../cc/iotkit/config/EmbeddedRedisConfig.java | 11 ++++++- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java index 49e70876..d0416207 100644 --- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java +++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java @@ -7,6 +7,7 @@ import cc.iotkit.data.ICommonData; import cc.iotkit.data.util.PageBuilder; import cc.iotkit.model.Id; import org.springframework.data.domain.Example; +import org.springframework.data.domain.ExampleMatcher; import org.springframework.data.domain.Page; import org.springframework.data.jpa.repository.JpaRepository; @@ -21,7 +22,7 @@ import java.util.Optional; * @Version: V1.0 * @Description: 基础数据操作接口 */ -public interface IJPACommData< T extends Id, ID> extends ICommonData { +public interface IJPACommData, ID> extends ICommonData { JpaRepository getBaseRepository(); @@ -73,15 +74,15 @@ public interface IJPACommData< T extends Id, ID> extends ICommonData findAll(PageRequest pageRequest) { + default Paging findAll(PageRequest pageRequest) { Example example = genExample(pageRequest.getData()); Page all = null; - if(Objects.isNull(example)){ + if (Objects.isNull(example)) { all = getBaseRepository().findAll(PageBuilder.toPageable(pageRequest)); - }else{ - all =getBaseRepository().findAll(example, PageBuilder.toPageable(pageRequest)); + } else { + all = getBaseRepository().findAll(example, PageBuilder.toPageable(pageRequest)); } - return PageBuilder.toPaging(all, getTClass()); + return PageBuilder.toPaging(all, getTClass()); } /** @@ -91,11 +92,11 @@ public interface IJPACommData< T extends Id, ID> extends ICommonData findAllByCondition(T data) { Example example = genExample(data); List all = null; - if(Objects.isNull(example)){ - all = getBaseRepository().findAll(); + if (Objects.isNull(example)) { + all = getBaseRepository().findAll(); - }else{ - all = getBaseRepository().findAll(example); + } else { + all = getBaseRepository().findAll(example); } return MapstructUtils.convert(all, getTClass()); @@ -109,7 +110,7 @@ public interface IJPACommData< T extends Id, ID> extends ICommonData, ID> extends ICommonData tbSysUser.status.eq(data.getStatus())) .and(Objects.nonNull(data.getDeptId()), () -> tbSysUser.deptId.eq(data.getDeptId())) .and(tbSysUser.delFlag.eq(UserConstants.ROLE_NORMAL)) - .and(Objects.nonNull(data.getRoleId()),()-> tbSysRole.id.eq(data.getRoleId())); + .and(Objects.nonNull(data.getRoleId()), () -> tbSysRole.id.eq(data.getRoleId())); QueryResults tbSysUserQueryResults = jpaQueryFactory.select(Projections.bean(TbSysUser.class, tbSysUser.id, tbSysUser.deptId, tbSysUser.userName, tbSysUser.nickName, tbSysUser.email, tbSysUser.phonenumber, tbSysUser.createTime)).from(tbSysUser) @@ -244,7 +244,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData selectUnallocatedList(PageRequest to) { SysUser data = to.getData(); PredicateBuilder builder = PredicateBuilder.instance(); - if(Objects.nonNull(data)){ + if (Objects.nonNull(data)) { builder.and(StringUtils.isNotBlank(data.getPhonenumber()), () -> tbSysUser.phonenumber.like(data.getPhonenumber())) .and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysUser.userName.like(data.getUserName())) .and(StringUtils.isNotBlank(data.getStatus()), () -> tbSysUser.status.eq(data.getStatus())) @@ -303,9 +303,9 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData tbSysUser.id.eq(user.getId())) - .and(StringUtils.isNotEmpty(user.getUserName()), () -> tbSysUser.userName.like(user.getUserName())) + .and(StringUtils.isNotEmpty(user.getUserName()), () -> tbSysUser.userName.like("%" + user.getUserName() + "%")) .and(StringUtils.isNotEmpty(user.getStatus()), () -> tbSysUser.status.eq(user.getStatus())) - .and(StringUtils.isNotEmpty(user.getPhonenumber()), () -> tbSysUser.phonenumber.like(user.getPhonenumber())) + .and(StringUtils.isNotEmpty(user.getPhonenumber()), () -> tbSysUser.phonenumber.like("%" + user.getPhonenumber() + "%")) .and(ObjectUtil.isNotEmpty(ids), () -> tbSysUser.deptId.in(ids)).build(); } } diff --git a/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java b/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java index de0ed01d..b6cf4f17 100644 --- a/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java +++ b/iot-starter/src/main/java/cc/iotkit/config/EmbeddedRedisConfig.java @@ -9,8 +9,10 @@ */ package cc.iotkit.config; +import lombok.extern.slf4j.Slf4j; import redis.embedded.RedisServer; +@Slf4j public class EmbeddedRedisConfig { public static boolean embeddedEnable() { @@ -28,7 +30,14 @@ public class EmbeddedRedisConfig { } else { redisServer = new RedisServer(); } - redisServer.start(); + try { + redisServer.start(); + } catch (Exception e) { + if (e.getMessage().contains("Address already in use")) { + throw new RuntimeException("redis端口被占用，请先停止本地的redis服务"); + } + log.error("start redis server failed", e); + } } }