周睡眠图表

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

@@ -24,6 +24,7 @@ import com.makeit.service.platform.space.*;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.convert.StreamUtil;
+import com.makeit.utils.old.StringUtils;
 import jodd.util.StringUtil;
 import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -95,7 +96,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
 
 
         String orgId = "";
         String orgId = "";
-        if(StringUtil.isNotEmpty(dto.getRoomId())){
+        if (StringUtil.isNotEmpty(dto.getRoomId())) {
             PlatRoom platRoom = platRoomService.getById(dto.getRoomId());
             PlatRoom platRoom = platRoomService.getById(dto.getRoomId());
             PlatSpace platSpace = platSpaceService.getById(platRoom.getSpaceId());
             PlatSpace platSpace = platSpaceService.getById(platRoom.getSpaceId());
             orgId = platSpace.getOrgId();
             orgId = platSpace.getOrgId();
@@ -110,7 +111,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()), PlatDevice::getName, dto.getName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getName()), PlatDevice::getName, dto.getName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getProductName()), PlatDevice::getProductName, dto.getProductName());
         queryWrapper.like(StringUtil.isNotEmpty(dto.getProductName()), PlatDevice::getProductName, dto.getProductName());
         queryWrapper.eq(StringUtil.isNotEmpty(dto.getStatus()), PlatDevice::getStatus, dto.getStatus());
         queryWrapper.eq(StringUtil.isNotEmpty(dto.getStatus()), PlatDevice::getStatus, dto.getStatus());
-        queryWrapper.eq(PlatDevice::getOrgId,orgId);
+        queryWrapper.eq(PlatDevice::getOrgId, orgId);
         Page<PlatDevice> pages = platDeviceService.page(p, queryWrapper);
         Page<PlatDevice> pages = platDeviceService.page(p, queryWrapper);
         List<PlatDeviceDTO> listRecord = BeanDtoVoUtils.listVo(pages.getRecords(), PlatDeviceDTO.class);
         List<PlatDeviceDTO> listRecord = BeanDtoVoUtils.listVo(pages.getRecords(), PlatDeviceDTO.class);
 
 
@@ -200,8 +201,17 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
     }
     }
 
 
     private List<PlatDevice> getDeviceInternal(String bedId, String category) {
     private List<PlatDevice> getDeviceInternal(String bedId, String category) {
+
+        if (StringUtils.isBlank(bedId)) {
+            return new ArrayList<>(10);
+        }
+
         PlatBed bed = platBedService.getById(bedId);
         PlatBed bed = platBedService.getById(bedId);
 
 
+        if (bed == null) {
+            return new ArrayList<>(10);
+        }
+
         List<PlatRoomBedDevice> deviceList = list(new QueryWrapper<PlatRoomBedDevice>().lambda()
         List<PlatRoomBedDevice> deviceList = list(new QueryWrapper<PlatRoomBedDevice>().lambda()
                 .eq(PlatRoomBedDevice::getRoomId, bed.getRoomId()));
                 .eq(PlatRoomBedDevice::getRoomId, bed.getRoomId()));
 
 

server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderChildrenInfoUserLoginWechatServiceImpl.java

@@ -62,7 +62,9 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
 
 
         String token = IdGen.getUUID();
         String token = IdGen.getUUID();
 
 
-        RequestUtil.setHeader(HeaderConst.WECHAT_TOKEN, token);
+        //RequestUtil.setHeader(HeaderConst.WECHAT_TOKEN, token);
+
+        platElderChildrenInfoService.saveOrUpdate(childrenInfo);
 
 
         WechatUserInfo wechatUserVo = BeanDtoVoUtils.convert(childrenInfo, WechatUserInfo.class);
         WechatUserInfo wechatUserVo = BeanDtoVoUtils.convert(childrenInfo, WechatUserInfo.class);
 
 
@@ -74,8 +76,6 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
 
 
         TokenUtil.wechatLogin(token, wechatUserVo);
         TokenUtil.wechatLogin(token, wechatUserVo);
 
 
-        platElderChildrenInfoService.saveOrUpdate(childrenInfo);
-
 
 
         return wechatUserVo;
         return wechatUserVo;