fix: 修复bug

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseEntity;
@@ -135,6 +136,10 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
     }
 
     private LambdaQueryWrapper<PlatAlarmRecord> getLambdaQueryWrapper(PlatAlarmRecordQueryDTO param) {
+        List<String> orgIdList = Lists.newArrayList();
+        if (StringUtils.isNotEmpty(param.getOrgId())) {
+            orgIdList = Lists.newArrayList(param.getOrgId().split(","));
+        }
         return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
                 .eq(StringUtils.isNotBlank(param.getId()),BaseEntity::getId,param.getId())
                 .le(Objects.nonNull(param.getCreateDateTo()), BaseEntity::getCreateDate, param.getCreateDateTo())
@@ -143,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                 .like(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser())
                 .ge(Objects.nonNull(param.getDealDateFrom()), PlatAlarmRecord::getDealDate, param.getDealDateFrom())
                 .le(Objects.nonNull(param.getDealDateTo()), PlatAlarmRecord::getDealDate, param.getDealDateTo())
-                .eq(StringUtils.isNotBlank(param.getOrgId()), PlatAlarmRecord::getOrgId, param.getOrgId())
+                .eq(CollectionUtils.isNotEmpty(orgIdList), PlatAlarmRecord::getOrgId, orgIdList)
                 .apply(StringUtils.isNotBlank(param.getNotifyUser()), "find_in_set('" + param.getNotifyUser() + "',notify_user)")
                 .and(CollectionUtils.isNotEmpty(param.getElderIdList()), qw -> {
                     List<String> elderIdList = param.getElderIdList();

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.makeit.common.dto.StatusDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
@@ -49,6 +50,7 @@ import com.makeit.vo.platform.elder.PlatElderExportVO;
 import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
 import com.makeit.vo.wechat.elder.PlatElderWechatSimpleVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -105,6 +107,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     private PersonalConfigCacheUtil personalConfigCacheUtil;
 
     private LambdaQueryWrapper<PlatElder> lambdaQueryWrapper(PlatElderQueryDTO dto) {
+        List<String> orgIdList = Lists.newArrayList();
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(dto.getOrgId())) {
+            orgIdList = Lists.newArrayList(dto.getOrgId().split(","));
+        }
         return new QueryWrapper<PlatElder>().lambda()
                 .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
                 .eq(StringUtils.isNotBlank(dto.getCertificateType()), PlatElder::getCertificateType, dto.getCertificateType())
@@ -114,6 +120,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                 .le(Objects.nonNull(dto.getCheckInEndTime()),PlatElder::getCheckInTime,dto.getCheckInEndTime())
                 .ge(Objects.nonNull(dto.getCheckOutStartTime()),PlatElder::getCheckOutTime,dto.getCheckOutStartTime())
                 .le(Objects.nonNull(dto.getCheckOutEndTime()),PlatElder::getCheckOutTime,dto.getCheckOutEndTime())
+                .eq(CollectionUtils.isNotEmpty(orgIdList), PlatElder::getOrgId, orgIdList)
                 .like(StringUtils.isNotBlank(dto.getCertificateNumber()), PlatElder::getCertificateNumber, dto.getCertificateNumber())
                 .apply(StringUtils.isNotBlank(dto.getSpaceId()), "find_in_set('" + dto.getSpaceId() + "',space_path)")
                 .apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)")

server-service/src/main/java/com/makeit/task/IotSyncTask.java

@@ -56,7 +56,7 @@ public class IotSyncTask {
      * 启用状态的租户才同步
      * 新增和更新平台端设备表
      */
-    @Scheduled(cron = "0 0/3 * * * *")
+    @Scheduled(cron = "0 0/3 * * * ?")
     public void syncEquipmentInfo() {
         savePlatDevice();
     }

server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java

@@ -61,6 +61,6 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
 
     @ApiModelProperty(value = "0-未读 1-已读")
     private String readFlag;
-
+    private String deviceId;
 
 }