diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java index df663fe7e..434202200 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java @@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo; +import com.zhgd.xmgl.modules.video.entity.vo.Recent10DayRecordsVo; import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import io.swagger.annotations.Api; @@ -317,6 +318,18 @@ public class AiAnalyseHardWareAlarmRecordController { } + @ApiOperation(value = "查询最近10天和各10条AI分析硬件设备报警记录", notes = "查询最近10天和各10条AI分析硬件设备报警记录", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "location", value = "位置", paramType = "body", dataType = "long"), + @ApiImplicitParam(name = "alarmType", value = "类型(字典)", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间,格式2020-08-16 00:00:00", dataType = "String", paramType = "body", required = false), + @ApiImplicitParam(name = "endTime", value = "结束时间,格式2020-08-16 23:59:59", dataType = "String", paramType = "body", required = false), + }) + @PostMapping(value = "/getRecent10DayRecords") + public Result> getRecent10DayRecords(@RequestBody Map param) { + return Result.success(aiAnalyseHardWareAlarmRecordService.getRecent10DayRecords(param)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/bo/Recent10DayRecordsBo.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/bo/Recent10DayRecordsBo.java new file mode 100644 index 000000000..c1415cc19 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/bo/Recent10DayRecordsBo.java @@ -0,0 +1,15 @@ +package com.zhgd.xmgl.modules.video.entity.bo; + +import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class Recent10DayRecordsBo extends AiAnalyseHardWareAlarmRecord { + /** + * 日期 + */ + @ApiModelProperty("日期") + private String date; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/Recent10DayRecordsVo.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/Recent10DayRecordsVo.java new file mode 100644 index 000000000..a56c84ae6 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/vo/Recent10DayRecordsVo.java @@ -0,0 +1,17 @@ +package com.zhgd.xmgl.modules.video.entity.vo; + +import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class Recent10DayRecordsVo { + /** + * 日期 + */ + @ApiModelProperty("日期") + private String date; + private List records; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java index 3abbe36d3..baeca90be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java @@ -6,6 +6,7 @@ import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; +import com.zhgd.xmgl.modules.video.entity.bo.Recent10DayRecordsBo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmRecordVo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; @@ -173,4 +174,6 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper map); + + List getRecent10DayRecords(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml index 3c3179841..c953b21a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml @@ -576,4 +576,73 @@ order by a.create_time desc limit 1 + + diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml index 90b8ea699..8e77e3094 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml @@ -172,7 +172,9 @@ FROM video_item t1 INNER JOIN project_video_config t2 ON t2.id = t1.video_id WHERE t2.is_enable = 1 - and t2.project_sn = #{projectSn} + + and t2.project_sn = #{projectSn} + order by t1.sort_num and t1.device_state = #{deviceState} diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java index 194f9ee9d..50f7b8feb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java @@ -8,6 +8,7 @@ import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo; import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTrendVo; +import com.zhgd.xmgl.modules.video.entity.vo.Recent10DayRecordsVo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import java.math.BigDecimal; @@ -174,4 +175,5 @@ public interface IAiAnalyseHardWareAlarmRecordService extends IService getRecent10DayRecords(Map param); }