fix:修复bug #I8DLHU

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java

@@ -9,6 +9,7 @@ import cc.iotkit.model.Id;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 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;
 
@@ -127,12 +128,13 @@ public interface IJPACommData<T extends Id<ID>, ID> extends ICommonData<T, ID> {
         return null;
     }
 
-
     default Example genExample(T data) {
         if (Objects.isNull(data)) {
             return null;
         }
-        return Example.of(MapstructUtils.convert(data, getJpaRepositoryClass()));
+        return Example.of(MapstructUtils.convert(data, getJpaRepositoryClass()),
+                ExampleMatcher.matching().withStringMatcher(ExampleMatcher.StringMatcher.CONTAINING)
+        );
     }
 
 

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java

@@ -109,7 +109,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         convert.setRoles(sysRoles);
 
         Long deptId = convert.getDeptId();
-        if(deptId==null){
+        if (deptId == null) {
             return convert;
         }
 
@@ -173,9 +173,9 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         TbSysUser ret = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
                 .where(PredicateBuilder.instance()
                         .and(tbSysUser.userName.eq(username))
-                        .and(TenantHelper.isEnable(),() -> tbSysUser.tenantId.eq(tenantId))
+                        .and(TenantHelper.isEnable(), () -> tbSysUser.tenantId.eq(tenantId))
                         .build()).fetchOne();
-        if(Objects.nonNull(ret)){
+        if (Objects.nonNull(ret)) {
             SysUser convert = MapstructUtils.convert(ret, SysUser.class);
             Long deptId = ret.getDeptId();
             if (Objects.nonNull(deptId)) {
@@ -188,7 +188,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
                 convert.setRoles(sysRoles);
             }
             return MapstructUtils.convert(ret, SysUser.class);
-        }else{
+        } else {
             return null;
         }
 
@@ -224,7 +224,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
                 .and(StringUtils.isNotBlank(data.getStatus()), () -> 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<TbSysUser> tbSysUserQueryResults = jpaQueryFactory.select(Projections.bean(TbSysUser.class, tbSysUser.id, tbSysUser.deptId, tbSysUser.userName,
                 tbSysUser.nickName, tbSysUser.email, tbSysUser.phonenumber, tbSysUser.createTime)).from(tbSysUser)
@@ -261,7 +261,7 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
     public Paging<SysUser> selectUnallocatedList(PageRequest<SysUser> 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()))
@@ -320,9 +320,9 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
         }
         return PredicateBuilder.instance()
                 .and(ObjectUtil.isNotNull(user.getId()), () -> 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();
     }
 }

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/ProductServiceImpl.java

@@ -192,10 +192,6 @@ public class ProductServiceImpl implements IProductService {
 
     @Override
     public Paging<ProductVo> selectPageList(PageRequest<ProductBo> request) {
-//        if (!AuthUtil.isAdmin()) {
-//            return productData.findByUid(AuthUtil.getUserId(), request.getPageNum(), request.getPageSize()).to(ProductVo.class);
-//        }
-
         return productData.findAll(request.to(Product.class)).to(ProductVo.class);
     }
 

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);
+        }
     }
 
 }