fix: saas 设备周报 租户隔离

server-module/src/main/java/com/makeit/module/controller/alarm/PlatAlarmRecordController.java

@@ -48,6 +48,13 @@ public class PlatAlarmRecordController {
         return ApiResponseUtils.success();
         return ApiResponseUtils.success();
     }
     }
 
 
+    @ApiOperation("未读条数")
+    @PostMapping("unreadCount")
+    public ApiResponseEntity<Integer> unreadCount(@RequestBody PlatAlarmRecordQueryDTO dto) {
+        Integer count =  platAlarmRecordService.unreadCount(dto);
+        return ApiResponseUtils.success(count);
+    }
+
 //    @Autowired
 //    @Autowired
 //    private MailMsgSender mailMsgSender;
 //    private MailMsgSender mailMsgSender;
 //    @Autowired
 //    @Autowired

server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java

@@ -43,5 +43,12 @@ public class PlatAlarmRecordChildrenController {
         platAlarmRecordService.read(dto.getId());
         platAlarmRecordService.read(dto.getId());
         return ApiResponseUtils.success();
         return ApiResponseUtils.success();
     }
     }
+
+    @ApiOperation("未读条数")
+    @PostMapping("unreadCount")
+    public ApiResponseEntity<Integer> unreadCount(@RequestBody PlatAlarmRecordQueryDTO dto) {
+        Integer count =  platAlarmRecordService.unreadCount(dto);
+        return ApiResponseUtils.success(count);
+    }
 }
 }
 
 

server-service/src/main/java/com/makeit/dto/platform/alarm/PlatAlarmRecordQueryDTO.java

@@ -63,6 +63,8 @@ public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
      */
      */
     private String noticeStatus;
     private String noticeStatus;
 
 
+    private String readFlag;
+
 
 
 
 
 }
 }

server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderReportDTO.java

@@ -40,4 +40,5 @@ public class PlatElderReportDTO extends PlatElderIdDTO {
     @ApiModelProperty("结束时间")
     @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
     private LocalDateTime endTime;
 
 
+    private String tenantId;
 }
 }

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

@@ -63,4 +63,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
     void dealAlarm(BaseIdDTO dto);
     void dealAlarm(BaseIdDTO dto);
 
 
     void read(String id);
     void read(String id);
+
+    Integer unreadCount(PlatAlarmRecordQueryDTO dto);
 }
 }

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

@@ -151,6 +151,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                     }
                     }
                 })
                 })
                 .eq(StringUtils.isNotBlank(param.getNoticeStatus()),PlatAlarmRecord::getNoticeStatus,param.getNoticeStatus())
                 .eq(StringUtils.isNotBlank(param.getNoticeStatus()),PlatAlarmRecord::getNoticeStatus,param.getNoticeStatus())
+                .eq(StringUtils.isNotBlank(param.getReadFlag()),PlatAlarmRecord::getReadFlag,param.getReadFlag())
                 .orderByDesc(BaseEntity::getCreateDate)
                 .orderByDesc(BaseEntity::getCreateDate)
                 ;
                 ;
     }
     }
@@ -509,4 +510,23 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                 .set(PlatAlarmRecord::getReadFlag, CommonEnum.YES.getValue());
                 .set(PlatAlarmRecord::getReadFlag, CommonEnum.YES.getValue());
         update(recordLambdaUpdateWrapper);
         update(recordLambdaUpdateWrapper);
     }
     }
+
+    @Override
+    public Integer unreadCount(PlatAlarmRecordQueryDTO dto) {
+        PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(WechatUserUtil.getUserId());
+        log.info("子女端账号："+platElderChildrenInfo.toString());
+        if (platElderChildrenInfo == null) {
+            return 0;
+        }
+        String elderId = platElderChildrenInfo.getElderId();
+        if(StringUtils.isBlank(elderId)){
+            return 0;
+        }
+        String[] split = elderId.split(",");
+        dto.setElderIdList(Arrays.asList(split));
+        dto.setNoticeStatus(CommonEnum.YES.getValue());
+        dto.setReadFlag(CommonEnum.NO.getValue());
+        LambdaQueryWrapper<PlatAlarmRecord> lambdaQueryWrapper = getLambdaQueryWrapper(dto);
+        return Math.toIntExact(count(lambdaQueryWrapper));
+    }
 }
 }

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

@@ -2,6 +2,7 @@ package com.makeit.service.platform.elder.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.*;
 import com.makeit.entity.platform.elder.*;
@@ -412,7 +413,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
             }
             }
         });
         });
 
 
-
+        lambdaQueryWrapper.eq(StringUtils.isNotBlank(platElderIdDTO.getTenantId()), BaseBusEntity::getTenantId,platElderIdDTO.getTenantId());
         lambdaQueryWrapper.orderByAsc(PlatElderBreatheDayStat::getDay);
         lambdaQueryWrapper.orderByAsc(PlatElderBreatheDayStat::getDay);
 
 
         List<PlatElderBreatheDayStat> breatheDayStatList = platElderBreatheDayStatService.list(lambdaQueryWrapper);
         List<PlatElderBreatheDayStat> breatheDayStatList = platElderBreatheDayStatService.list(lambdaQueryWrapper);