Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit c4111d8f by lzy
Options

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

parents 52c3cd4e fba8cf6f
Inline Side-by-side
Showing with 58 additions and 10 deletions
server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java
...@@ -115,6 +115,8 @@ public enum CodeMessageEnum { ...@@ -115,6 +115,8 @@ public enum CodeMessageEnum {
PLATFORM_ERROR_ROOM_OTHER_USED_NOT_DEL(500, "PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL"), PLATFORM_ERROR_ROOM_OTHER_USED_NOT_DEL(500, "PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL"),
PLATFORM_ERROR_BED_BIND_DEVICE_NOT_AUTH(500, "PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH"), PLATFORM_ERROR_BED_BIND_DEVICE_NOT_AUTH(500, "PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH"),
PLATFORM_ERROR_ELDER_BED_CANT_DEL(500, "PLATFORM.ERROR.ELDER.BED.CANT.DEL"),
SYSTEM_ERROR_CANT_CHANGE_TENANT_STATUS(500, "SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS"), SYSTEM_ERROR_CANT_CHANGE_TENANT_STATUS(500, "SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS"),
SYSTEM_ERROR_CANT_REMOVE_TENANT_USER_LINK(500, "SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK"), SYSTEM_ERROR_CANT_REMOVE_TENANT_USER_LINK(500, "SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK"),
SYSTEM_ERROR_TENANT_ID_NOT_BLANK(510, "SYSTEM.ERROR.TENANT.ID.NOT.BLANK"), SYSTEM_ERROR_TENANT_ID_NOT_BLANK(510, "SYSTEM.ERROR.TENANT.ID.NOT.BLANK"),
......
server-common/src/main/resources/locale/business_messages.properties
...@@ -109,6 +109,8 @@ PLATFORM.ERROR.BAD.NOT.DEL=床位已绑定长者或设备，不可删除 ...@@ -109,6 +109,8 @@ PLATFORM.ERROR.BAD.NOT.DEL=床位已绑定长者或设备，不可删除
PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL=该房间下有床位有其他长者入住 PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL=该房间下有床位有其他长者入住
PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH=该床位已绑定设备，请重新选择床位 PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH=该床位已绑定设备，请重新选择床位
PLATFORM.ERROR.ELDER.BED.CANT.DEL=含入住床位的老人，不可删除
SYSTEM.ERROR.ROLE.ADMIN.CANT.ADD=不能在该节点下新增非管理员角色 SYSTEM.ERROR.ROLE.ADMIN.CANT.ADD=不能在该节点下新增非管理员角色
SYSTEM.ERROR.ROLE.ADMIN.CANT.EDIT=管理员角色不能修改 SYSTEM.ERROR.ROLE.ADMIN.CANT.EDIT=管理员角色不能修改
......
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderController.java
...@@ -8,6 +8,7 @@ import com.makeit.common.page.PageVO; ...@@ -8,6 +8,7 @@ import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.common.vo.ExcelImportVo; import com.makeit.common.vo.ExcelImportVo;
import com.makeit.dto.platform.elder.PlatElderAvatarDTO;
import com.makeit.dto.platform.elder.PlatElderCheckInDTO; import com.makeit.dto.platform.elder.PlatElderCheckInDTO;
import com.makeit.dto.platform.elder.PlatElderCheckOutDTO; import com.makeit.dto.platform.elder.PlatElderCheckOutDTO;
import com.makeit.dto.platform.elder.PlatElderQueryDTO; import com.makeit.dto.platform.elder.PlatElderQueryDTO;
...@@ -128,6 +129,13 @@ public class PlatElderController { ...@@ -128,6 +129,13 @@ public class PlatElderController {
return ApiResponseUtils.success(); return ApiResponseUtils.success();
} }
@ApiOperation("上传头像")
@PostMapping("uploadAvatar")
public ApiResponseEntity<?> uploadAvatar(@RequestBody PlatElderAvatarDTO dto) {
platElderService.uploadAvatar(dto);
return ApiResponseUtils.success();
}
} }
server-module/src/main/java/com/makeit/module/controller/space/PlatSpaceController.java
...@@ -80,7 +80,7 @@ public class PlatSpaceController { ...@@ -80,7 +80,7 @@ public class PlatSpaceController {
return ApiResponseUtils.success(data); return ApiResponseUtils.success(data);
} }
@ApiOperation("树-到床位（已住人床位）") @ApiOperation("树-到床位（未住人床位）")
@PostMapping("listTreeAuthIgnoreByBed") @PostMapping("listTreeAuthIgnoreByBed")
public ApiResponseEntity<List<PlatSpaceVO>> listTreeAuthIgnoreByBed(@RequestBody PlatSpaceQueryDTO dto) { public ApiResponseEntity<List<PlatSpaceVO>> listTreeAuthIgnoreByBed(@RequestBody PlatSpaceQueryDTO dto) {
List<PlatSpaceVO> data = spaceService.listBedTree(dto,true); List<PlatSpaceVO> data = spaceService.listBedTree(dto,true);
......
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderAvatarDTO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 长者基本信息
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Elder对象", description = "长者基本信息")
public class PlatElderAvatarDTO extends BaseTenantDTO {
@ApiModelProperty(value = "头像文件id")
private String avatar;
}
server-service/src/main/java/com/makeit/enums/report/HeartRateTypeEnum.java
...@@ -9,7 +9,7 @@ public enum HeartRateTypeEnum { ...@@ -9,7 +9,7 @@ public enum HeartRateTypeEnum {
BRADYCARDIA("bradycardia","心率过缓"), BRADYCARDIA("bradycardia","心率过缓"),
TACHYCARDIA("tachycardia","呼吸过速"); TACHYCARDIA("tachycardia","心率过速");
private String code; private String code;
private String value; private String value;
......
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderService.java
...@@ -52,6 +52,8 @@ public interface PlatElderService extends IService<PlatElder> { ...@@ -52,6 +52,8 @@ public interface PlatElderService extends IService<PlatElder> {
void delBatch(List<String> idList); void delBatch(List<String> idList);
void uploadAvatar(PlatElderAvatarDTO dto);
PlatDevice getBreathDevice(String id); PlatDevice getBreathDevice(String id);
List<PlatDevice> getSpaceDevice(String id); List<PlatDevice> getSpaceDevice(String id);
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderReportMonthServiceImpl.java
...@@ -17,7 +17,9 @@ import com.makeit.service.platform.elder.*; ...@@ -17,7 +17,9 @@ import com.makeit.service.platform.elder.*;
import com.makeit.service.saas.PlatTenantService; import com.makeit.service.saas.PlatTenantService;
import com.makeit.utils.data.convert.BeanDtoVoUtils; import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.convert.StreamUtil; import com.makeit.utils.data.convert.StreamUtil;
import com.makeit.utils.data.validate.CollectionUtils;
import com.makeit.utils.data.validate.MapUtil; import com.makeit.utils.data.validate.MapUtil;
import com.makeit.utils.old.StringUtils;
import com.makeit.utils.time.LocalDateTimeUtils; import com.makeit.utils.time.LocalDateTimeUtils;
import com.makeit.vo.platform.elder.report.day.PlatElderHeartRespiratoryEvaluationVO; import com.makeit.vo.platform.elder.report.day.PlatElderHeartRespiratoryEvaluationVO;
import com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO; import com.makeit.vo.platform.elder.report.day.PlatElderReportMonthVO;
...@@ -173,8 +175,10 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport ...@@ -173,8 +175,10 @@ public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReport
List<DeviceInfoContentBreathe> breatheList = iotProductDeviceService.getDeviceLogByTimeRangeBreathe(platDevice.getOriDeviceId(), 2 * 24 * 3600, yesStart, yesEnd); 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())); if (CollectionUtils.isNotEmpty(breatheList)) {
reportMonth.setRespiratoryRate((int) (StreamUtil.reduce(breatheList, i -> (long) i.getProperties().getBr(), 0L, Long::sum) / breatheList.size())); 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)); List<PlatAlarmRecord> rList = Optional.ofNullable(recordMap.get(e.getId())).orElse(new ArrayList<>(10));
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
...@@ -9,10 +9,7 @@ import com.makeit.common.page.PageReqDTO; ...@@ -9,10 +9,7 @@ import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO; import com.makeit.common.page.PageVO;
import com.makeit.common.vo.ExcelErrorVo; import com.makeit.common.vo.ExcelErrorVo;
import com.makeit.common.vo.ExcelImportVo; import com.makeit.common.vo.ExcelImportVo;
import com.makeit.dto.platform.elder.PlatElderCheckInDTO; import com.makeit.dto.platform.elder.*;
import com.makeit.dto.platform.elder.PlatElderCheckOutDTO;
import com.makeit.dto.platform.elder.PlatElderImportDTO;
import com.makeit.dto.platform.elder.PlatElderQueryDTO;
import com.makeit.dto.platform.elder.add.*; import com.makeit.dto.platform.elder.add.*;
import com.makeit.dto.platform.space.PlatSpaceSplitDTO; import com.makeit.dto.platform.space.PlatSpaceSplitDTO;
import com.makeit.dto.platform.space.TreeDTOVO; import com.makeit.dto.platform.space.TreeDTOVO;
...@@ -832,7 +829,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -832,7 +829,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
PlatElder db = getById(id); PlatElder db = getById(id);
if (StringUtils.isNotBlank(db.getBedId())) { if (StringUtils.isNotBlank(db.getBedId())) {
throw new RuntimeException(); throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ELDER_BED_CANT_DEL);
} }
removeById(id); removeById(id);
...@@ -845,7 +842,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -845,7 +842,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
dbList.forEach(e -> { dbList.forEach(e -> {
if (StringUtils.isNotBlank(e.getBedId())) { if (StringUtils.isNotBlank(e.getBedId())) {
throw new RuntimeException();//TODO ywc 报错具体换 throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ELDER_BED_CANT_DEL);//TODO ywc 报错具体换
} }
}); });
...@@ -855,6 +852,14 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -855,6 +852,14 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
} }
@Override @Override
public void uploadAvatar(PlatElderAvatarDTO dto) {
PlatElder platElder = getById(dto.getId());
platElder.setAvatar(dto.getAvatar());
updateById(platElder);
}
@Override
public PlatDevice getBreathDevice(String id) { public PlatDevice getBreathDevice(String id) {
PlatElder platElder = getById(id); PlatElder platElder = getById(id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment