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

server-api/src/main/java/com/makeit/api/external/filter/SignAuthFilter.java

@@ -30,7 +30,7 @@ public class SignAuthFilter implements Filter {
 		HttpServletRequest request = (HttpServletRequest) req;
 		HttpServletResponse response = (HttpServletResponse) res;
 		try {
-			String sign = request.getHeader("sign");
+			String sign = request.getHeader("token");
 			if (StringUtils.isEmpty(sign)) {
 				response.sendError(403, "Forbidden");
 				return;

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

@@ -385,13 +385,13 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate);
 
         String deviceId = null;
-        String oriDeviceId = null;
+        //String oriDeviceId = null;
 
         PlatDevice platDevice = platElderRealTimeService.getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 
         if (platDevice != null) {
             deviceId = platDevice.getId();
-            oriDeviceId = platDevice.getOriDeviceId();
+            //oriDeviceId = platDevice.getOriDeviceId();
         }
 
         LambdaQueryWrapper<PlatElderBreatheDayStat> lambdaQueryWrapper = new QueryWrapper<PlatElderBreatheDayStat>().lambda();
@@ -400,17 +400,17 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         lambdaQueryWrapper.le(PlatElderBreatheDayStat::getDay, weekEndDate);
 
         String finalDeviceId = deviceId;
-        String finalOriDeviceId = oriDeviceId;
-        lambdaQueryWrapper.and(StringUtils.isNotBlank(platElderIdDTO.getElderId()) || StringUtils.isNotBlank(finalDeviceId) || StringUtils.isNotBlank(finalOriDeviceId), qw -> {
+        //String finalOriDeviceId = oriDeviceId;
+        lambdaQueryWrapper.and(StringUtils.isNotBlank(platElderIdDTO.getElderId()) || StringUtils.isNotBlank(finalDeviceId) /*|| StringUtils.isNotBlank(finalOriDeviceId)*/, qw -> {
             if (StringUtils.isNotBlank(platElderIdDTO.getElderId())) {
                 qw.eq(PlatElderBreatheDayStat::getElderId, platElderIdDTO.getElderId());
             }
             if (StringUtils.isNotBlank(finalDeviceId)) {
                 qw.or().eq(PlatElderBreatheDayStat::getDeviceId, finalDeviceId);
             }
-            if (StringUtils.isNotBlank(finalOriDeviceId)) {
-                qw.or().eq(PlatElderBreatheDayStat::getOriDeviceId, finalOriDeviceId);
-            }
+//            if (StringUtils.isNotBlank(finalOriDeviceId)) {
+//                qw.or().eq(PlatElderBreatheDayStat::getOriDeviceId, finalOriDeviceId);
+//            }
         });
 
         lambdaQueryWrapper.eq(StringUtils.isNotBlank(platElderIdDTO.getTenantId()), BaseBusEntity::getTenantId,platElderIdDTO.getTenantId());
@@ -418,7 +418,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
         List<PlatElderBreatheDayStat> breatheDayStatList = platElderBreatheDayStatService.list(lambdaQueryWrapper);
 
-        Map<LocalDate, PlatElderBreatheDayStat> map = StreamUtil.toMap(breatheDayStatList, PlatElderBreatheDayStat::getDay);
+        Map<LocalDate, PlatElderBreatheDayStat> map = StreamUtil.toMapDep(breatheDayStatList, PlatElderBreatheDayStat::getDay);
 
         List<PlatElderRealTimeHeartRespiratoryWeekVO> voList = new ArrayList<>(10);
 

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

@@ -114,7 +114,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                 .orderByDesc(PlatElder::getId);
     }
 
-    private void fill(List<PlatElderListVO> list){
+    private void fill(List<PlatElderListVO> list) {
+
         JoinUtil.join(list, platOrgService, PlatElderListVO::getOrgId, PlatOrg::getId, (d, o) -> {
             d.setOrgName(o.getName());
         });
@@ -191,6 +192,15 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         List<PlatElder> dbList = list(lambdaQueryWrapper(dto));
 
+        dbList.forEach(e->{
+            if (StringUtils.isNotBlank(e.getHomeAddressDetail())) {
+                e.setHomeAddressDetail(e.getHomeAddress());
+            }
+            if (StringUtils.isNotBlank(e.getRegisterAddressDetail())) {
+                e.setRegisterAddressDetail(e.getRegisterAddress());
+            }
+        });
+
         List<PlatElderHealthInfo> healthInfoList = platElderHealthInfoService.list(new QueryWrapper<PlatElderHealthInfo>().lambda()
                 .in(PlatElderHealthInfo::getElderId, StreamUtil.mapId(dbList, PlatElder::getId)));
         Map<String, PlatElderHealthInfo> healthInfoMap = StreamUtil.toMap(healthInfoList, PlatElderHealthInfo::getElderId);
@@ -576,9 +586,23 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
     }
 
+    private void addressToDetail(PlatElderDTOVO dto) {
+
+        if (StringUtils.isNotBlank(dto.getHomeAddressDetail())) {
+            dto.setHomeAddressDetail(dto.getHomeAddress());
+        }
+        if (StringUtils.isNotBlank(dto.getRegisterAddressDetail())) {
+            dto.setRegisterAddressDetail(dto.getRegisterAddress());
+        }
+    }
+
+
     @Transactional
     @Override
     public void addAll(PlatElderDTOVO dto) {
+
+        addressToDetail(dto);
+
         check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
 
         PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
@@ -665,6 +689,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     @Transactional
     public void edit(PlatElderDTOVO dto) {
 
+        addressToDetail(dto);
+
         check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
 
         PlatElder db = getById(dto.getId());
@@ -700,6 +726,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         PlatElder platElder = getById(id);
         PlatElderDTOVO vo = BeanDtoVoUtils.convert(platElder, PlatElderDTOVO.class);
 
+        addressToDetail(vo);
+
         FileUtil.convert(Arrays.asList(vo), PlatElderDTOVO::getAvatar, (e, f) -> {
             e.setAvatar(f.getFullUrl());
         });