admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AI预警类型统计修改

Browse Source
This commit is contained in:
guoshengxiong 2024-05-13 11:03:04 +08:00
parent d4b9faac0a
commit 9d33bd0fa6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java
View File

@ -44,7 +44,7 @@ public class AiStatisticController {
@ApiOperation(value = "AI预警类型统计", notes = "AI预警类型统计")
@ApiImplicitParams({
@ApiImplicitParam(name = "sn", value = "公司或项目sn", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "type", value = "默认查今日，1查今天、今天较昨天、本月、历史", paramType = "body", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "type", value = "0默认查今日，1查今天、今天较昨天、本月、历史", paramType = "body", required = false, dataType = "String"),
})
@PostMapping("/selectAiAnalyseHardWareAlarmTypeCount")
public Result<AiAnalyseHardWareAlarmTypeCountVO> selectAiAnalyseHardWareAlarmTypeCount(@RequestBody Map<String, Object> map) {

6
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
View File

@ -199,14 +199,14 @@
INNER JOIN company b ON cp.parent_id = b.company_id
Left JOIN company f ON b.parent_id = f.company_id
where 1 = 1
<if test="param.notType == '1'.toString() or param.timeUnit == '2'.toString()">
<if test="param.timeUnit == 'today'.toString()">
and w1.create_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
</if>
<if test="param.timeUnit == '1'.toString()">
<if test="param.timeUnit == 'yesterday'.toString()">
and w1.create_time &gt;= CONCAT(DATE_FORMAT(DATE_SUB(now(), interval 1 day), '%Y-%m-%d'), ' 00:00:00')
and w1.create_time &lt;= CONCAT(DATE_FORMAT(DATE_SUB(now(), interval 1 day), '%Y-%m-%d'), ' 23:59:59')
</if>
<if test="param.timeUnit == '3'.toString()">
<if test="param.timeUnit == 'thisMonth'.toString()">
and w1.create_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-01'), ' 00:00:00')
</if>
<if test="param.companyType == '1'.toString()">

8
src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiStatisticServiceImpl.java
View File

@ -70,7 +70,7 @@ public class AiStatisticServiceImpl implements IAiStatisticService {
List<AiAnalyseHardWareAlarmRecordVo> rsList = new ArrayList<>();
Integer type = MapUtils.getInteger(param, "type");
if (type == null) {
param.put("notType", 1);
param.put("timeUnit", "today");
//默认查今日
rsList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
for (AiAnalyseHardWareAlarmRecordVo record : rsList) {
@ -78,11 +78,11 @@ public class AiStatisticServiceImpl implements IAiStatisticService {
}
} else if (Objects.equals(type, 1)) {
List<AiAnalyseHardWareAlarmRecordVo> historyList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
map.put("timeUnit", 1);
map.put("timeUnit", "yesterday");
List<AiAnalyseHardWareAlarmRecordVo> yesterdayList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
map.put("timeUnit", 2);
map.put("timeUnit", "today");
List<AiAnalyseHardWareAlarmRecordVo> todayList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
map.put("timeUnit", 3);
map.put("timeUnit", "thisMonth");
List<AiAnalyseHardWareAlarmRecordVo> monthList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
Map<Integer, AiAnalyseHardWareAlarmRecordVo> todayMap = todayList.stream().collect(Collectors.toMap(AiAnalyseHardWareAlarmRecordVo::getAlarmType, Function.identity(), (aiAnalyseHardWareAlarmRecord, aiAnalyseHardWareAlarmRecord2) -> aiAnalyseHardWareAlarmRecord));
Map<Integer, AiAnalyseHardWareAlarmRecordVo> yesterdayMap = yesterdayList.stream().collect(Collectors.toMap(AiAnalyseHardWareAlarmRecordVo::getAlarmType, Function.identity(), (aiAnalyseHardWareAlarmRecord, aiAnalyseHardWareAlarmRecord2) -> aiAnalyseHardWareAlarmRecord));