Browse Source

fix: 修复堤防动态监测bug

master_tdsql
hxh 1 year ago
parent
commit
0a7d779cda
  1. 3
      shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java
  2. 4
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java

3
shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java

@ -37,6 +37,9 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
"<if test='dto.adcd != null and dto.adcd != \"\"'>",
"and adcd = #{dto.adcd} ",
"</if>",
"<if test='dto.dikeGrad != null and dto.dikeGrad != \"\"'>",
"and dike_grad = #{dto.dikeGrad} ",
"</if>",
"<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>",
"and adcd_start = #{dto.adcdStart} ",
"</if>",

4
shuili-system/src/main/java/com/kms/yxgh/df/service/DfDeviceCheckingService.java

@ -51,12 +51,16 @@ public class DfDeviceCheckingService extends BaseService<DfDeviceCheckingMapper,
private static Function<DfDeviceChecking, DfDeviceCheckingDetailDto> 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<List<DfDeviceCheckingDetailDto.Config>>() {
}));
return dto;

Loading…
Cancel
Save