fix：区域设置固化数据

server-service/src/main/java/com/makeit/dto/platform/space/PlatRegionSettingFixQueryDTO.java

@@ -15,8 +15,8 @@ public class PlatRegionSettingFixQueryDTO {
     @ApiModelProperty("报告类型 0：日报 1：周报")
     private String reportType;
 
-    @ApiModelProperty("长者ID")
-    private String elderId;
+    @ApiModelProperty("房间ID")
+    private String roomId;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("日期 yyyy-MM-dd")

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

@@ -67,25 +67,14 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC
             return;
         }
         PlatElderCoordinateRecord platElderCoordinateRecord;
-        PlatRegionSettingFix platRegionSettingFix;
 
         List<PlatRegionSetting> platRegionSettingList = platRegionSettingService.list(new QueryWrapper<>());
-        Function<PlatRegionSetting,String> function = entity -> entity.getRoomId() + "-" + entity.getDeviceId();
-        Map<String, PlatRegionSetting> platRegionSettingMap = StreamUtil.toMap(platRegionSettingList,
-                function);
-
 
         for (PlatElder platElder : elderList) {
 
             List<PlatElderCoordinateVO> elderCoordinateVOList = platElderDayReportDayService.coordinateList(platElder.getId(), null, datStart, dayEnd);
-            Set<String> deviceIdSet = Sets.newHashSet();
             List<PlatElderCoordinateRecord> list = Lists.newArrayList();
             for (PlatElderCoordinateVO vo : elderCoordinateVOList) {
-                if (vo.getTimestamp() == null) {
-                    // 过滤空数据
-                    deviceIdSet.add(vo.getDeviceId());
-                    continue;
-                }
                 platElderCoordinateRecord = new PlatElderCoordinateRecord();
                 BeanUtils.copyProperties(vo,platElderCoordinateRecord);
                 if (CollectionUtils.isNotEmpty(vo.getTrack())) {
@@ -100,18 +89,13 @@ public class PlatElderCoordinateRecordServiceImpl extends ServiceImpl<PlatElderC
                 list.add(platElderCoordinateRecord);
             }
             saveBatch(list);
-
-            for (String deviceId : deviceIdSet) {
-                PlatRegionSetting platRegionSetting = platRegionSettingMap.get(platElder.getRoomId() + "-" + deviceId);
-                if (platRegionSetting != null) {
-                    platRegionSettingFix = new PlatRegionSettingFix();
-                    BeanUtils.copyProperties(platRegionSetting,platRegionSettingFix,"id");
-                    platRegionSettingFix.setElderId(platElder.getId());
-                    platRegionSettingFix.setHappenDate(yesDate.toString());
-                    platRegionSettingFixService.save(platRegionSettingFix);
-                }
-            }
-
         }
+        List<PlatRegionSettingFix> settingFixList = StreamUtil.map(platRegionSettingList, setting -> {
+            PlatRegionSettingFix settingFix = new PlatRegionSettingFix();
+            BeanUtils.copyProperties(setting, settingFix,"id");
+            settingFix.setHappenDate(yesDate.toString());
+            return settingFix;
+        });
+        platRegionSettingFixService.saveBatch(settingFixList);
     }
 }

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

@@ -469,7 +469,6 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
 
         platDeviceListSpace.forEach(e -> {
             List<DeviceInfoContentSpace> spaceList = iotProductDeviceService.getDeviceLogByTimeRangeSpace(e.getOriDeviceId(), 24 * 3600, start, end);
-            if (CollectionUtils.isNotEmpty(spaceList)) {
             voList.addAll(StreamUtil.map(spaceList, i -> {
 
                         PlatElderCoordinateVO vo = new PlatElderCoordinateVO();
@@ -486,19 +485,11 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
 
                     })
             );
-            } else {
-                // 没有上报数据也把设备返回
-                PlatElderCoordinateVO platElderCoordinateVO = new PlatElderCoordinateVO();
-                platElderCoordinateVO.setDeviceId(e.getId());
-                platElderCoordinateVO.setOriDeviceId(e.getOriDeviceId());
-                voList.add(platElderCoordinateVO);
-            }
 
         });
 
         platDeviceListFall.forEach(e -> {
             List<DeviceInfoContentFall> fallList = iotProductDeviceService.getDeviceLogByTimeRangeFall(e.getOriDeviceId(), 2 * 24 * 3600, start, end);
-            if (CollectionUtils.isNotEmpty(fallList)) {
             voList.addAll(StreamUtil.map(fallList, i -> {
 
                         PlatElderCoordinateVO vo = new PlatElderCoordinateVO();
@@ -514,13 +505,6 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
 
                     })
             );
-            } else {
-                // 没有上报数据也把设备返回
-                PlatElderCoordinateVO platElderCoordinateVO = new PlatElderCoordinateVO();
-                platElderCoordinateVO.setDeviceId(e.getId());
-                platElderCoordinateVO.setOriDeviceId(e.getOriDeviceId());
-                voList.add(platElderCoordinateVO);
-            }
         });
 
         return voList;

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

@@ -39,12 +39,12 @@ public class PlatRegionSettingFixServiceImpl extends ServiceImpl<PlatRegionSetti
 
     @Override
     public List<PlatRegionSettingDTO> list(PlatRegionSettingFixQueryDTO dto) {
-        if (StringUtils.isAnyBlank(dto.getReportType(), dto.getElderId())) {
+        if (StringUtils.isAnyBlank(dto.getReportType(), dto.getRoomId())) {
             return Lists.newArrayList();
         }
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LambdaQueryWrapper<PlatRegionSettingFix> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PlatRegionSettingFix::getElderId, dto.getElderId());
+        queryWrapper.eq(PlatRegionSettingFix::getRoomId, dto.getRoomId());
         if ("0".equals(dto.getReportType())) {
             queryWrapper.eq(PlatRegionSettingFix::getHappenDate, dateTimeFormatter.format(dto.getNow()));
         } else {