Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-common/src/main/java/com/makeit/module/iot/service/IotProductDeviceService.java

@@ -93,6 +93,8 @@ public class IotProductDeviceService extends IotCommonService {
         return CollectionUtils.isNotEmpty(deviceOperationLogEntities) ? deviceOperationLogEntities.get(0) : null;
     }
 
+    //TODO ywc 下面几个使用时还要不要根据状态的过滤
+
     public DeviceInfoContentBreathe getLastDeviceLogBreathe(String deviceId, Integer ignoreDuration) {//秒
         DeviceOperationLogEntity deviceOperationLogEntity = getLastDeviceLogByType(deviceId, REPORT_PROPERTY);
         if (deviceOperationLogEntity == null) {

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderController.java

@@ -80,6 +80,13 @@ public class PlatElderController {
         return ApiResponseUtils.success();
     }
 
+    @ApiOperation("新增全部")
+    @PostMapping("addAll")
+    public ApiResponseEntity<?> addAll(@Validated @RequestBody PlatElderDTOVO dto) {
+        platElderService.addAll(dto);
+        return ApiResponseUtils.success();
+    }
+
     @ApiOperation("编辑")
     @PostMapping("edit")
     public ApiResponseEntity<?> edit(@Validated @RequestBody PlatElderDTOVO dto) {

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportMonthController.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @author eugene young
  * @since 2023-08-29
  */
-@Api(tags = "长者报告-周报")
+@Api(tags = "长者报告-月报")
 @RestController
 @RequestMapping("/plat/elder/report/month")
 public class PlatElderReportMonthController {

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportWeekController.java

@@ -51,7 +51,7 @@ public class PlatElderReportWeekController {
     @ApiOperation("睡眠图表")
     @PostMapping("sleepDiagram")
     public ApiResponseEntity<PlatElderSleepDiagramWeekVO> sleepDiagram(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportWeekService.sleepDiagram(platElderIdDTO));
     }
 
     @ApiOperation("心率呼吸评价")

server-service/src/main/java/com/makeit/dto/saas/analysis/SaasDiseaseEvaluateReportDTO.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @since 2023-09-05
  */
 @Data
-@ApiModel(value = "SaasDiseaseEvaluateReport对象", description = "呼吸心率慢性病模型评估结果")
+@ApiModel(value = "SaasDiseaseEvaluateReport对象", description = "呼吸心率慢性病模型评估标准")
 public class SaasDiseaseEvaluateReportDTO {
 
     private String id;

server-service/src/main/java/com/makeit/entity/saas/analysis/SaasDiseaseEvaluateReport.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="SaasDiseaseEvaluateReport对象", description="呼吸心率慢性病模型评估结果")
+@ApiModel(value="SaasDiseaseEvaluateReport对象", description="呼吸心率慢性病模型评估标准")
 public class SaasDiseaseEvaluateReport extends BaseBusEntity {
 
     private static final long serialVersionUID = 1L;

server-service/src/main/java/com/makeit/entity/saas/analysis/SaasDiseaseReport.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="SaasDiseaseReport对象", description="呼吸心率慢性病报告")
+@ApiModel(value="SaasDiseaseReport对象", description="呼吸心率慢性病报告评估结果")
 public class SaasDiseaseReport extends BaseBusEntity {
 
     private static final long serialVersionUID = 1L;

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

@@ -28,5 +28,7 @@ public interface PlatElderReportMonthService extends IService<PlatElderReportMon
 
     List<PlatElderReportMonthVO> reportMonth(PlatElderReportDTO platElderIdDTO);
 
+    void reportMonthJob();
+
 
 }

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

@@ -38,6 +38,8 @@ public interface PlatElderService extends IService<PlatElder> {
 
     void add(PlatElderAddDTO dto);
 
+    void addAll(PlatElderDTOVO dto);
+
     void edit(PlatElderDTOVO dto);
 
     PlatElderDTOVO view(String id);

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

@@ -198,6 +198,9 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         List<PlatAlarmRecord> recordList = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda()
                 .eq(PlatAlarmRecord::getAlarmType, alarmType)
                 .eq(PlatAlarmRecord::getDeviceId, device.getId())
+
+                .eq(PlatAlarmRecord::getElderIds, platElderIdDTO.getElderId())
+
                 .ge(PlatAlarmRecord::getAlarmDate, start)
                 .le(PlatAlarmRecord::getAlarmDate, end)
                 .orderByDesc(PlatAlarmRecord::getAlarmDate)
@@ -269,6 +272,9 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         List<PlatAlarmRecord> recordList = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda()
                 .eq(PlatAlarmRecord::getAlarmType, PlatAlarmConfigEnum.AlarmTypeEnum.BEHAVIOR.getValue())
                 .in(PlatAlarmRecord::getDeviceId, StreamUtil.mapId(platDeviceList, PlatDevice::getId))
+
+                .eq(PlatAlarmRecord::getElderIds, platElderIdDTO.getElderId())
+
                 .ge(PlatAlarmRecord::getAlarmDate, start)
                 .le(PlatAlarmRecord::getAlarmDate, end)
                 .orderByDesc(PlatAlarmRecord::getAlarmDate)

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

@@ -3,11 +3,21 @@ package com.makeit.service.platform.elder.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
+import com.makeit.entity.platform.alarm.PlatAlarmRecord;
+import com.makeit.entity.platform.device.PlatDevice;
+import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElderReportMonth;
+import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
+import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.mapper.platform.elder.PlatElderReportMonthMapper;
-import com.makeit.service.platform.elder.PlatElderDayReportWeekService;
-import com.makeit.service.platform.elder.PlatElderReportMonthService;
+import com.makeit.module.iot.service.IotProductDeviceService;
+import com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe;
+import com.makeit.service.platform.alarm.PlatAlarmRecordService;
+import com.makeit.service.platform.elder.*;
+import com.makeit.service.saas.PlatTenantService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
+import com.makeit.utils.data.convert.StreamUtil;
+import com.makeit.utils.data.validate.MapUtil;
 import com.makeit.utils.time.LocalDateTimeUtils;
 import com.makeit.vo.platform.elder.report.day.PlatElderHeartRespiratoryEvaluationVO;
 import com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO;
@@ -17,7 +27,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * <p>
@@ -30,9 +45,28 @@ import java.util.List;
 @Service
 public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReportMonthMapper, PlatElderReportMonth> implements PlatElderReportMonthService {
 
+
+    @Autowired
+    private PlatElderRealTimeService platElderRealTimeService;
+
     @Autowired
     private PlatElderDayReportWeekService platElderDayReportWeekService;
 
+    @Autowired
+    private PlatTenantService platTenantService;
+
+    @Autowired
+    private PlatElderService platElderService;
+
+    @Autowired
+    private PlatElderSleepAnalysisService platElderSleepAnalysisService;
+
+    @Autowired
+    private PlatAlarmRecordService platAlarmRecordService;
+
+    @Autowired
+    private IotProductDeviceService iotProductDeviceService;
+
     public LocalDate monthStartDate(PlatElderReportDTO platElderIdDTO) {
         return monthStartDate(platElderIdDTO.getYear(), platElderIdDTO.getMonth());
     }
@@ -97,4 +131,66 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport
 
         return voList;
     }
+
+    @Override
+    public void reportMonthJob() {
+        LocalDate nowDate = LocalDate.now();
+        LocalDate yesDate = nowDate.minusDays(1);
+
+        LocalDateTime yesStart = LocalDateTimeUtils.getDayStart(yesDate);
+        LocalDateTime yesEnd = LocalDateTimeUtils.getDayEnd(yesDate);
+
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        List<PlatElderReportMonth> reportMonthList = new ArrayList<>(10);
+
+        platTenantService.executeTenantList(() -> {
+            List<PlatElder> elderList = platElderService.list(new QueryWrapper<PlatElder>().lambda()
+                    .isNotNull(PlatElder::getBedId));
+
+            List<PlatElderSleepAnalysis> sleepAnalysesList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
+                    .in(PlatElderSleepAnalysis::getElderId, StreamUtil.mapId(elderList, PlatElder::getId))
+                    .eq(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(yesDate))
+            );
+
+            Map<String, PlatElderSleepAnalysis> sleepAnalysisMap = StreamUtil.toMap(sleepAnalysesList, PlatElderSleepAnalysis::getElderId);
+
+            List<PlatAlarmRecord> recordList = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda()
+                    .in(PlatAlarmRecord::getElderIds, StreamUtil.mapId(elderList, PlatElder::getId)));
+
+            Map<String, List<PlatAlarmRecord>> recordMap = StreamUtil.groupBy(recordList, PlatAlarmRecord::getElderIds);
+
+            elderList.forEach(e -> {
+                PlatElderReportMonth reportMonth = new PlatElderReportMonth();
+                reportMonth.setElderId(e.getBedId());
+                reportMonth.setDay(yesDate);
+
+                MapUtil.setIfPresent(sleepAnalysisMap, e.getId(), sa -> {
+                    reportMonth.setSleepResult(sa.getSleepResult());
+                });
+
+                PlatDevice platDevice = platElderRealTimeService.getBreathDevice(e.getId(), null);
+
+                List<DeviceInfoContentBreathe> breatheList = iotProductDeviceService.getDeviceLogByTimeRangeBreathe(platDevice.getOriDeviceId(), 2 * 24 * 3600, yesStart, yesEnd);
+
+                reportMonth.setHeartRate((int) (StreamUtil.reduce(breatheList, i -> (long) i.getProperties().getHr(), 0L, Long::sum) / breatheList.size()));
+                reportMonth.setRespiratoryRate((int) (StreamUtil.reduce(breatheList, i -> (long) i.getProperties().getBr(), 0L, Long::sum) / breatheList.size()));
+
+                List<PlatAlarmRecord> rList = Optional.ofNullable(recordMap.get(e.getId())).orElse(new ArrayList<>(10));
+
+                reportMonth.setFailCount((int) StreamUtil.count(rList, i -> PlatAlarmConfigEnum.AlarmTypeEnum.FALL.getValue().equals(i.getAlarmType())));
+                reportMonth.setHeartExceptionCount((int) StreamUtil.count(rList, i -> PlatAlarmConfigEnum.AlarmTypeEnum.HEART.getValue().equals(i.getAlarmType())));
+                reportMonth.setRespiratoryExceptionCount((int) StreamUtil.count(rList, i -> PlatAlarmConfigEnum.AlarmTypeEnum.BREATHE.getValue().equals(i.getAlarmType())));
+                reportMonth.setBehaviorExceptionCount((int) StreamUtil.count(rList, i -> PlatAlarmConfigEnum.AlarmTypeEnum.BEHAVIOR.getValue().equals(i.getAlarmType())));
+
+                reportMonthList.add(reportMonth);
+
+            });
+
+            saveBatch(reportMonthList);
+
+
+        });
+
+    }
 }

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

@@ -514,18 +514,32 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
     }
 
-    @Override
     @Transactional
-    public void edit(PlatElderDTOVO dto) {
-
+    @Override
+    public void addAll(PlatElderDTOVO dto) {
         check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
 
-        PlatElder db = getById(dto.getId());
-
         PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
 
-        updateById(platElder);
+        PlatUserVO userVO = PlatUserUtil.getUserVO();
 
+        platElder.setOrgId(userVO.getOrgId());
+        platElder.setCityOrgId(userVO.getCityOrgId());
+        platElder.setDistrictOrgId(userVO.getDistrictOrgId());
+        platElder.setStreetOrgId(userVO.getStreetOrgId());
+        platElder.setOrgPath(userVO.getOrgPath());
+
+        save(platElder);
+
+        addOrEditExt(dto);
+
+        if (StringUtils.isNotBlank(dto.getBedId())) {
+            checkInInternal(dto.getBedId());
+        }
+
+    }
+
+    private void addOrEditExt(PlatElderDTOVO dto) {
         List<PlatElderSocialRelation> relationList = BeanDtoVoUtils.listVo(dto.getRelationList(), PlatElderSocialRelation.class);
         relationList.forEach(e -> {
             e.setElderId(dto.getId());
@@ -544,6 +558,21 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         otherInfo.setElderId(dto.getId());
 
         platElderOtherInfoService.saveOrUpdate(otherInfo);
+    }
+
+    @Override
+    @Transactional
+    public void edit(PlatElderDTOVO dto) {
+
+        check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
+
+        PlatElder db = getById(dto.getId());
+
+        PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
+
+        updateById(platElder);
+
+        addOrEditExt(dto);
 
         if (StringUtils.isNotBlank(dto.getBedId()) && StringUtils.isBlank(db.getBedId())) {
             checkInInternal(dto.getBedId());

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java

@@ -13,14 +13,14 @@ import com.makeit.dto.platform.space.PlatSpaceDeviceQueryDTO;
 import com.makeit.dto.platform.space.PlatUnbindingDeviceDTO;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.space.PlatBed;
+import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.entity.platform.space.PlatRoomBedDevice;
+import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.platform.device.PlatDeviceEnum;
 import com.makeit.mapper.platform.space.PlatRoomBedDeviceMapper;
 import com.makeit.service.platform.device.PlatDeviceService;
-import com.makeit.service.platform.space.PlatBedService;
-import com.makeit.service.platform.space.PlatRegionSettingService;
-import com.makeit.service.platform.space.PlatRoomBedDeviceService;
+import com.makeit.service.platform.space.*;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
@@ -50,6 +50,10 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
     private PlatBedService platBedService;
     @Autowired
     private PlatRegionSettingService platRegionSettingService;
+    @Autowired
+    private PlatRoomService platRoomService;
+    @Autowired
+    private PlatSpaceService platSpaceService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -84,12 +88,19 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         if (StringUtil.isNotEmpty(dto.getRoomId())) {
             queryWrapper1.ne(PlatRoomBedDevice::getRoomId, dto.getRoomId());
         }
-        if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
+        if (CommonEnum.YES.getValue().equals(dto.getIsRoom())) {
             queryWrapper1.isNull(PlatRoomBedDevice::getBedId);
         }
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
 
+        String orgId = null;
+        if(StringUtil.isNotEmpty(dto.getRoomId())){
+            PlatRoom platRoom = platRoomService.getById(dto.getRoomId());
+            PlatSpace platSpace = platSpaceService.getById(platRoom.getSpaceId());
+            orgId = platSpace.getOrgId();
+        }
+
 
         Page<PlatDevice> p = PageUtil.toMpPage(pageReqDTO);
         LambdaQueryWrapper<PlatDevice> queryWrapper = new LambdaQueryWrapper<>();
@@ -99,6 +110,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()), PlatDevice::getName, dto.getName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getProductName()), PlatDevice::getProductName, dto.getProductName());
         queryWrapper.eq(StringUtil.isNotEmpty(dto.getStatus()), PlatDevice::getStatus, dto.getStatus());
+        queryWrapper.eq(StringUtil.isNotEmpty(orgId),PlatDevice::getOrgId,orgId);
         Page<PlatDevice> pages = platDeviceService.page(p, queryWrapper);
         List<PlatDeviceDTO> listRecord = BeanDtoVoUtils.listVo(pages.getRecords(), PlatDeviceDTO.class);
 
@@ -178,7 +190,12 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
             return null;
         }
 
-        return platDeviceService.getById(device.getDeviceId());
+        //return platDeviceService.getById(device.getDeviceId());
+
+        return platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
+                .eq(PlatDevice::getId, device.getDeviceId())
+                .eq(PlatDevice::getCategory, PlatDeviceEnum.CategoryEnum.HEART.getValue())
+        );
 
     }
 

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomServiceImpl.java

@@ -12,6 +12,7 @@ import com.makeit.dto.platform.workstation.WorkStationQueryDTO;
 import com.makeit.entity.platform.space.PlatBed;
 import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.enums.CodeMessageEnum;
+import com.makeit.enums.CommonEnum;
 import com.makeit.exception.BusinessException;
 import com.makeit.mapper.platform.space.PlatRoomMapper;
 import com.makeit.service.platform.space.PlatBedService;
@@ -97,6 +98,7 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
 
         LambdaQueryWrapper<PlatBed> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(PlatBed::getRoomId, ids);
+        queryWrapper.eq(PlatBed::getStatus, CommonEnum.NO.getValue());
         if (platBedService.count(queryWrapper) > 0) {
             throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ROOM_EXIT_BAD);
         }

server-service/src/main/java/com/makeit/service/saas/PlatTenantService.java

@@ -12,10 +12,10 @@ import com.makeit.module.admin.vo.plat.PlatTenantVO;
 import java.util.List;
 
 /**
-* @author lixl
-* @description 针对表【tnt_tenant(租户管理)】的数据库操作Service
-* @createDate 2023-08-29 14:29:10
-*/
+ * @author lixl
+ * @description 针对表【tnt_tenant(租户管理)】的数据库操作Service
+ * @createDate 2023-08-29 14:29:10
+ */
 public interface PlatTenantService extends IService<PlatTenant> {
     PageVO<PlatTenantVO> page(PageReqDTO<PlatTenantVO> page);
 
@@ -38,4 +38,6 @@ public interface PlatTenantService extends IService<PlatTenant> {
     void assignMenuList(PlatTenantMenuDTO tntTenantMenuDTO);
 
     void checkTenant(String id);
+
+    void executeTenantList(Runnable runnable);
 }

server-service/src/main/java/com/makeit/service/saas/impl/PlatTenantServiceImpl.java

@@ -48,6 +48,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -55,13 +56,13 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
-* @author lixl
-* @description 针对表【tnt_tenant(租户管理)】的数据库操作Service实现
-* @createDate 2023-08-29 14:29:10
-*/
+ * @author lixl
+ * @description 针对表【tnt_tenant(租户管理)】的数据库操作Service实现
+ * @createDate 2023-08-29 14:29:10
+ */
 @Service
 public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTenant>
-implements PlatTenantService {
+        implements PlatTenantService {
 
     @Autowired
     private PlatUserService platUserService;
@@ -131,8 +132,8 @@ implements PlatTenantService {
 
         List<PlatTenantVO> voList = BeanDtoVoUtils.listVo(pageList.getRecords(), PlatTenantVO.class);
 
-        TntUserJoinUtil.join(platUserService,voList,qw->qw.eq(PlatUser::getIsTenant, IsTenantAccountEnum.YES.getValue()),
-                PlatTenantVO::getPlatUserId,(t, u) -> {
+        TntUserJoinUtil.join(platUserService, voList, qw -> qw.eq(PlatUser::getIsTenant, IsTenantAccountEnum.YES.getValue()),
+                PlatTenantVO::getPlatUserId, (t, u) -> {
                     t.setUserAccount(u.getAccount());
                     t.setUserName(u.getUsername());
                 }, BaseEntity::getId);
@@ -176,12 +177,12 @@ implements PlatTenantService {
     @Override
     public void assignMenuList(PlatTenantMenuDTO tntTenantMenuDTO) {
 
-        assignMenuList(tntTenantMenuDTO.getTenantId(),tntTenantMenuDTO.getMenuIdList());
+        assignMenuList(tntTenantMenuDTO.getTenantId(), tntTenantMenuDTO.getMenuIdList());
 
     }
 
     @Transactional
-    public void assignMenuList(String tenantId,List<String> menuIdList) {
+    public void assignMenuList(String tenantId, List<String> menuIdList) {
         platTenantMenuService.remove(new QueryWrapper<PlatTenantMenu>().lambda()
                 .eq(PlatTenantMenu::getTenantId, tenantId));
 
@@ -217,14 +218,14 @@ implements PlatTenantService {
         sysConfigService.copyForTenant(dto);
 
         //更新用户的tenantId
-        platUserService.updatePlatUserTenantId(tntTenant.getId(),dto.getPlatUserId());
+        platUserService.updatePlatUserTenantId(tntTenant.getId(), dto.getPlatUserId());
 
         //组织表增加一条数据
         PlatOrg platOrg = convertToPlatOrg(tntTenant);
         platOrgService.saveOrg(platOrg);
 
         //分配菜单
-        assignMenuList(tntTenant.getId(),dto.getMenuIdList());
+        assignMenuList(tntTenant.getId(), dto.getMenuIdList());
         return tntTenant.getId();
     }
 
@@ -239,26 +240,26 @@ implements PlatTenantService {
         PlatTenant tntTenant = BeanDtoVoUtils.convert(dto, PlatTenant.class);
         PlatTenant platTenant = getById(tntTenant.getId());
         //更新同步到iot
-        iotOrgService.updateIotOrgInfo(tntTenant.getIotOrgId(),dto.getName());
+        iotOrgService.updateIotOrgInfo(tntTenant.getIotOrgId(), dto.getName());
 
         updateById(tntTenant);
 
         //更新用户的tenantId
-        if(!StringUtils.equals(dto.getPlatUserId(),platTenant.getPlatUserId())) {
+        if (!StringUtils.equals(dto.getPlatUserId(), platTenant.getPlatUserId())) {
             platUserService.updatePlatUserTenantId(null, dto.getPlatUserId());
         }
-        platUserService.updatePlatUserTenantId(tntTenant.getId(),dto.getPlatUserId());
+        platUserService.updatePlatUserTenantId(tntTenant.getId(), dto.getPlatUserId());
 
         PlatOrg platOrg = convertToPlatOrg(tntTenant);
         //更新组织表
         platOrgService.edit(platOrg);
 
         //分配菜单 todo 慢
-        assignMenuList(tntTenant.getId(),dto.getMenuIdList());
+        assignMenuList(tntTenant.getId(), dto.getMenuIdList());
 
     }
 
-    public PlatOrg convertToPlatOrg(PlatTenant platTenant){
+    public PlatOrg convertToPlatOrg(PlatTenant platTenant) {
         PlatOrg platOrg = new PlatOrg();
         platOrg.setTenantId(platTenant.getId());
         platOrg.setName(platTenant.getName());
@@ -274,12 +275,12 @@ implements PlatTenantService {
     public PlatTenantDTOVO view(String id) {
         PlatTenantDTOVO userVO = BeanDtoVoUtils.convert(getById(id), PlatTenantDTOVO.class);
 
-        TntUserJoinUtil.join(platUserService,Arrays.asList(userVO), PlatTenantDTOVO::getPlatUserId,(t,u)->t.setPlatUserVO(BeanDtoVoUtils.convert(u,PlatUserVO.class))  ,PlatUser::getId);
+        TntUserJoinUtil.join(platUserService, Arrays.asList(userVO), PlatTenantDTOVO::getPlatUserId, (t, u) -> t.setPlatUserVO(BeanDtoVoUtils.convert(u, PlatUserVO.class)), PlatUser::getId);
 
         LambdaQueryWrapper<PlatTenantMenu> tenantMenuLambdaQueryWrapper = new LambdaQueryWrapper<PlatTenantMenu>()
                 .eq(BaseBusEntity::getTenantId, id);
         List<PlatTenantMenu> list = platTenantMenuService.list(tenantMenuLambdaQueryWrapper);
-        if(CollectionUtils.isNotEmpty(list)){
+        if (CollectionUtils.isNotEmpty(list)) {
             List<String> menuList = list.stream().map(PlatTenantMenu::getMenuId).collect(Collectors.toList());
             userVO.setMenuIdList(menuList);
         }
@@ -385,11 +386,30 @@ implements PlatTenantService {
         PlatTenant tntTenant = getOne(
                 new QueryWrapper<PlatTenant>().lambda()
                         .eq(PlatTenant::getCode, dto.getCode())
-                        .ne(StringUtils.isNotBlank(dto.getId()),PlatTenant::getCode,dto.getCode())
+                        .ne(StringUtils.isNotBlank(dto.getId()), PlatTenant::getCode, dto.getCode())
         );
 
         if (tntTenant != null && !tntTenant.getId().equals(dto.getId())) {
             throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_TENANT_CODE_DUPLICATE);
         }
     }
+
+    @Override
+    public void executeTenantList(Runnable runnable) {
+
+        LocalDateTime now = LocalDateTime.now();
+
+        List<PlatTenant> tntTenantList = list(new QueryWrapper<PlatTenant>().lambda()
+                .eq(PlatTenant::getStatus, CommonEnum.YES.getValue())
+                .le(PlatTenant::getStartTime, now)
+                .ge(PlatTenant::getEndTime, now)
+        );
+
+
+        tntTenantList.forEach(e -> {
+            TenantIdUtil.execute(e.getId(), runnable);
+        });
+    }
+
+
 }

server-service/src/main/java/com/makeit/service/saas/impl/SaasElderReportConfigServiceImpl.java

@@ -56,7 +56,7 @@ public class SaasElderReportConfigServiceImpl extends ServiceImpl<SaasElderRepor
         // 根据睡眠报告结果配置得出最后的睡眠评分
         EvaluateReportVO finalReport = new EvaluateReportVO();
         for (EvaluateReportVO evaluateReportVO : evaluateReportList) {
-            String[] scoreRange = evaluateReportVO.getScoreRange().split("~");
+            String[] scoreRange = evaluateReportVO.getScoreRange().split("-");
             long scoreRangeStart = Long.parseLong(scoreRange[0]);
             long scoreRangeEnd = Long.parseLong(scoreRange[1]);
             if (scoreRangeStart <= totalScore && scoreRangeEnd >= totalScore) {

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

+package com.makeit.task;
+
+import com.makeit.service.platform.elder.PlatElderReportMonthService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ReportMonthJob {
+
+    @Autowired
+    private PlatElderReportMonthService platElderReportMonthService;
+
+    @Scheduled(cron = "0 0 1 * * ? ")
+    public void job(){
+        platElderReportMonthService.reportMonthJob();
+    }
+
+}