Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit e7b8192c by huangjy
Options

fix: 优化需求

parent 1eca1780
Inline Side-by-side
Showing with 33 additions and 1 deletions
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderQueryDTO.java
package com.makeit.dto.platform.elder; package com.makeit.dto.platform.elder;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 长者基本信息 * 长者基本信息
...@@ -40,6 +43,23 @@ public class PlatElderQueryDTO extends BaseTenantDTO { ...@@ -40,6 +43,23 @@ public class PlatElderQueryDTO extends BaseTenantDTO {
@ApiModelProperty(value = "房间id") @ApiModelProperty(value = "房间id")
private String roomId; private String roomId;
@ApiModelProperty(value = "是否入住 1 入住 0 退住")
private Integer checkInFlag;
@ApiModelProperty(value = "入住开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime checkInStartTime;
@ApiModelProperty(value = "入住结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime checkInEndTime;
@ApiModelProperty(value = "退住开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime checkOutStartTime;
@ApiModelProperty(value = "退住结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime checkOutEndTime;
} }
server-service/src/main/java/com/makeit/dto/platform/space/PlatBedPanoramaDTO.java
...@@ -22,6 +22,8 @@ public class PlatBedPanoramaDTO { ...@@ -22,6 +22,8 @@ public class PlatBedPanoramaDTO {
@ApiModelProperty("类型 1-空间 2-房间") @ApiModelProperty("类型 1-空间 2-房间")
private String type; private String type;
@ApiModelProperty("机构id")
private String orgId;
@DictEnum(em = PlatBedStatusEnum.BedStatusEnum.class, message = "状态可选值为{m}") @DictEnum(em = PlatBedStatusEnum.BedStatusEnum.class, message = "状态可选值为{m}")
@ApiModelProperty("状态 1-空闲 0-已入住") @ApiModelProperty("状态 1-空闲 0-已入住")
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
...@@ -108,6 +108,12 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder ...@@ -108,6 +108,12 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
return new QueryWrapper<PlatElder>().lambda() return new QueryWrapper<PlatElder>().lambda()
.like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName()) .like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
.eq(StringUtils.isNotBlank(dto.getCertificateType()), PlatElder::getCertificateType, dto.getCertificateType()) .eq(StringUtils.isNotBlank(dto.getCertificateType()), PlatElder::getCertificateType, dto.getCertificateType())
.isNotNull(dto.getCheckInFlag() != null && dto.getCheckInFlag() == 1,PlatElder::getBedId)
.isNull(dto.getCheckInFlag() != null && dto.getCheckInFlag() == 0,PlatElder::getBedId)
.ge(Objects.nonNull(dto.getCheckInStartTime()),PlatElder::getCheckInTime,dto.getCheckInStartTime())
.le(Objects.nonNull(dto.getCheckInEndTime()),PlatElder::getCheckInTime,dto.getCheckInEndTime())
.ge(Objects.nonNull(dto.getCheckOutStartTime()),PlatElder::getCheckOutTime,dto.getCheckOutStartTime())
.le(Objects.nonNull(dto.getCheckOutEndTime()),PlatElder::getCheckOutTime,dto.getCheckOutEndTime())
.like(StringUtils.isNotBlank(dto.getCertificateNumber()), PlatElder::getCertificateNumber, dto.getCertificateNumber()) .like(StringUtils.isNotBlank(dto.getCertificateNumber()), PlatElder::getCertificateNumber, dto.getCertificateNumber())
.apply(StringUtils.isNotBlank(dto.getSpaceId()), "find_in_set('" + dto.getSpaceId() + "',space_path)") .apply(StringUtils.isNotBlank(dto.getSpaceId()), "find_in_set('" + dto.getSpaceId() + "',space_path)")
.apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)") .apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)")
......
server-service/src/main/java/com/makeit/task/IotSyncTask.java
...@@ -110,7 +110,7 @@ public class IotSyncTask { ...@@ -110,7 +110,7 @@ public class IotSyncTask {
} }
platDevice.setOriDeviceId(iotDevice.getId()); platDevice.setOriDeviceId(iotDevice.getId());
platDevice.setName(iotDevice.getName()); platDevice.setName(iotDevice.getName());
//platDevice.setOrgId(tenantId); platDevice.setOrgId(tenantId);
String productName = iotDevice.getProductName(); String productName = iotDevice.getProductName();
platDevice.setProductName(productName); platDevice.setProductName(productName);
platDevice.setProductId(iotDevice.getProductId()); platDevice.setProductId(iotDevice.getProductId());
......
server-service/src/main/resources/mappers/PlatBedMapper.xml
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
SELECT pb.id,pb.status,pb.name as bedName ,pm.name as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId SELECT pb.id,pb.status,pb.name as bedName ,pm.name as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
FROM plat_bed pb FROM plat_bed pb
LEFT JOIN plat_room pm on pb.room_id = pm.id LEFT JOIN plat_room pm on pb.room_id = pm.id
LEFT JOIN plat_space ps on pb.space_id = ps.id
LEFT JOIN plat_elder pe on pe.bed_id = pb.id LEFT JOIN plat_elder pe on pe.bed_id = pb.id
<where> <where>
pb.del_flag = 0 pb.del_flag = 0
...@@ -17,6 +18,9 @@ ...@@ -17,6 +18,9 @@
<if test="dto.status != null and dto.status != ''"> <if test="dto.status != null and dto.status != ''">
AND pb.status = #{dto.status} AND pb.status = #{dto.status}
</if> </if>
<if test="dto.orgId != null and dto.orgId != ''">
AND ps.orgId = #{orgId}
</if>
</where> </where>
</select> </select>
......
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