diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java index 45f9bba70..191d608b5 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.base.entity.vo; import cn.hutool.core.util.NumberUtil; import cn.hutool.http.HttpUtil; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zhgd.xmgl.enums.BaseEnum; import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem; import io.swagger.annotations.ApiModelProperty; @@ -19,9 +20,12 @@ import java.util.stream.Collectors; @Data @AllArgsConstructor @NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) public class SectorVo { @ApiModelProperty("总数") private String count; + @ApiModelProperty("影响天数") + private Integer dayNum; private List data; diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 2874c668e..9ee8f9a02 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -141,8 +141,6 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); ArrayList statsDelayEventType(Map paramMap); + + Integer countDayNum(Map paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml index 4dbc3947f..a75fd5216 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml @@ -13,9 +13,6 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java index ec7062ede..62af3a02c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java @@ -122,7 +122,11 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) {