diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java index cdf281a5..925c06ba 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java @@ -37,6 +37,9 @@ public interface BsSgcDfJbxxMapper extends BaseMapper { "", "and adcd = #{dto.adcd} ", "", + "", + "and dike_grad = #{dto.dikeGrad} ", + "", "", "and adcd_start = #{dto.adcdStart} ", "", diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java index ec94b040..f15105e0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java @@ -51,12 +51,16 @@ public class DfDeviceCheckingService extends BaseService getDfDeviceCheckingDfDeviceCheckingDetailDtoFunction() { return item -> { DfDeviceCheckingDetailDto dto = new DfDeviceCheckingDetailDto(); + dto.setId(item.getId()); dto.setDeviceId(item.getDeviceId()); dto.setMessage(item.getMessage()); dto.setName(item.getName()); dto.setType(item.getType()); dto.setWarningType(item.getWarningType()); + dto.setWarningLevel(item.getWarningLevel()); dto.setDikeCode(item.getDikeCode()); + dto.setCreateTime(item.getCreateTime()); + dto.setUpdateTime(item.getUpdateTime()); dto.setConfigs(JSON.parseObject(item.getConfig(), new TypeReference>() { })); return dto;