Pārlūkot izejas kodu

修改AI报警的问题

konghl 4 gadi atpakaļ
vecāks
revīzija
59730ace07

+ 21 - 3
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/AiAlarmManageController.java

@ -3,6 +3,7 @@ package com.ai.bss.security.protection.controller;
3 3
import java.util.ArrayList;
4 4
import java.util.Date;
5 5
import java.util.HashMap;
6
import java.util.List;
6 7
import java.util.Map;
7 8
8 9
import org.apache.commons.lang.StringUtils;
@ -56,8 +57,6 @@ public class AiAlarmManageController {
56 57
		// 每页条数
57 58
		int pageSize = aiQuery.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : aiQuery.getPageSize();
58 59
59
		ArrayList<Object> statusList = new ArrayList<>();
60
		statusList.add(aiQuery.getStatusList());
61 60
		Map<String, Object> params = new HashMap<>();
62 61
		params.put("workOrgRoleId", aiQuery.getWorkOrgRoleId());
63 62
		params.put("alarmTypeCode", aiQuery.getAlarmTypeCode());
@ -65,7 +64,12 @@ public class AiAlarmManageController {
65 64
		params.put("workEmployeeRoleId", aiQuery.getWorkEmployeeRoleId());
66 65
		params.put("beginTime", aiQuery.getBeginTime());
67 66
		params.put("endTime", aiQuery.getEndTime());
68
		params.put("statusList",statusList);
67
		
68
		if (StringUtils.isNotBlank(aiQuery.getStatusList())) {
69
			ArrayList<Object> statusList = new ArrayList<>();
70
			statusList.add(aiQuery.getStatusList());
71
			params.put("statusList",statusList);
72
		}
69 73
70 74
		CommonResponse<PageBean<Map<String, Object>>> commonResponse = aiAlarmManageService.queryPageAiAlarm(params,
71 75
				pageNumber, pageSize);
@ -120,4 +124,18 @@ public class AiAlarmManageController {
120 124
		return aiAlarmManageService.queryOneAiAlarmInfo(workTaskId);
121 125
	}
122 126
127
	/**
128
	 * 查询AI告警信息数量
129
	 * @param workTaskId
130
	 * @return
131
	 * @throws Exception
132
	 */
133
	@ResponseBody
134
	@RequestMapping("/queryAiAlarmCount")
135
	public CommonResponse<List<Map<String, Object>>> queryAiAlarmCount() throws Exception {
136
		Map<String, Object> params=new HashMap<String, Object>();
137
		List<Map<String, Object>> resultList=aiAlarmManageService.queryAiAlarmCount(params);
138
		return CommonResponse.ok(resultList);
139
	}
140
	
123 141
}

+ 33 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AiAlarmManageServiceImpl.java

@ -1,5 +1,6 @@
1 1
package com.ai.bss.security.protection.service.impl;
2 2
3
import java.util.ArrayList;
3 4
import java.util.HashMap;
4 5
import java.util.List;
5 6
import java.util.Map;
@ -176,4 +177,36 @@ public class AiAlarmManageServiceImpl implements AiAlarmManageService {
176 177
		resultMap.put("videoInfo", ebcMonitorVideoLog);
177 178
		return CommonResponse.ok(resultMap);
178 179
	}
180
181
	@Override
182
	public List<Map<String,Object>> queryAiAlarmCount(Map<String, Object> params) throws Exception {
183
		CommonRequest<Map<String, Object>> request=new CommonRequest<Map<String,Object>>(params);
184
        CommonResponse<List<Map<String,Object>>> response = aiTaskQuery.safetyAlarmStatusStatistics(request);
185
		
186
        List<Map<String,Object>> resultList=new ArrayList<Map<String,Object>>();
187
        long iniCount=0;
188
        long runCount=0;
189
        
190
        if (response!=null&&!CollectionUtils.isEmpty(response.getData())) {
191
	        for (Map<String, Object> map : response.getData()) {
192
	        	if (WorkTask.INIT_STATUS.equals(String.valueOf(map.get("status")))) {
193
	        		iniCount=(long)map.get("cn");
194
				}else if (WorkTask.RUNNING_STATUS.equals(String.valueOf(map.get("status")))){
195
					runCount=(long)map.get("cn");
196
				}
197
			}
198
        }
199
        
200
        Map<String, Object> map=new HashMap<String, Object>();
201
        map.put("name", "ini");
202
        map.put("value", iniCount);
203
        resultList.add(map);
204
        
205
        map=new HashMap<String, Object>();
206
        map.put("name", "run");
207
        map.put("value", iniCount+runCount);
208
        resultList.add(map);
209
        
210
        return resultList;
211
	}
179 212
}

+ 8 - 0
security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/AiAlarmManageService.java

@ -32,4 +32,12 @@ public interface AiAlarmManageService {
32 32
	 * @return
33 33
	 */
34 34
	CommonResponse<List<Map<String, Object>>> queryAiTaskByDevice(String resourceToolId, String aiIdenModel);
35
	
36
	/**
37
	 * 查询AI告警信息数量
38
	 * @param params
39
	 * @return
40
	 * @throws Exception
41
	 */
42
	List<Map<String, Object>> queryAiAlarmCount(Map<String, Object> params) throws Exception;
35 43
}