瀏覽代碼

提交git空格问题

wangchao 4 年之前
父節點
當前提交
d62d029c61

+ 1 - 1
location-rescue-service/src/main/java/com/ai/bss/location/rescue/util/NorthboundInterfaceUtil.java

29
    @Value("${aap.iot.passWord:123456}")
29
    @Value("${aap.iot.passWord:123456}")
30
    private String passWord;
30
    private String passWord;
31
31
32
    @Value("${url.iot.login:http://60.205.219.67:80/sso/login}")
32
    @Value("${url.iot.login:http://60.205.219.67:80/sso}")
33
    private String iotLoginUrl;
33
    private String iotLoginUrl;
34
34
35
    @Value("${url.iot.service:http://60.205.219.67:80/dmp/terminalNorthApi/}")
35
    @Value("${url.iot.service:http://60.205.219.67:80/dmp/terminalNorthApi/}")

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

48
	*                            statusList: 处理状态列表
48
	*                            statusList: 处理状态列表
49
	* @return 结果集,具体如下:
49
	* @return 结果集,具体如下:
50
	*                            状态、状态时间、处理详情、报警类型、报警描述、设备名称、设备编号、设备位置、报警时间、处理人、处理时间、图片url、视频url
50
	*                            状态、状态时间、处理详情、报警类型、报警描述、设备名称、设备编号、设备位置、报警时间、处理人、处理时间、图片url、视频url
51
	 * @throws Exception 
51
	 * @throws Exception
52
	*/
52
	*/
53
	@ResponseBody
53
	@ResponseBody
54
	@RequestMapping("/queryPageAiAlarm")
54
	@RequestMapping("/queryPageAiAlarm")
65
		params.put("workEmployeeRoleId", aiQuery.getWorkEmployeeRoleId());
65
		params.put("workEmployeeRoleId", aiQuery.getWorkEmployeeRoleId());
66
		params.put("beginTime", aiQuery.getBeginTime());
66
		params.put("beginTime", aiQuery.getBeginTime());
67
		params.put("endTime", aiQuery.getEndTime());
67
		params.put("endTime", aiQuery.getEndTime());
68
		
68
69
		if (StringUtils.isNotBlank(aiQuery.getStatusList())) {
69
		if (StringUtils.isNotBlank(aiQuery.getStatusList())) {
70
			ArrayList<Object> statusList = new ArrayList<>();
70
			ArrayList<Object> statusList = new ArrayList<>();
71
			statusList.add(aiQuery.getStatusList());
71
			statusList.add(aiQuery.getStatusList());
100
		workTask.setStatus(aiQuery.getStatus());
100
		workTask.setStatus(aiQuery.getStatus());
101
		workTask.setWorkTaskId(aiQuery.getWorkTaskId());
101
		workTask.setWorkTaskId(aiQuery.getWorkTaskId());
102
		workTask.setProcessMemo(aiQuery.getProcessMemo());
102
		workTask.setProcessMemo(aiQuery.getProcessMemo());
103
		
103
104
		// 申请人ID和部门
104
		// 申请人ID和部门
105
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
105
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
106
		workTask.setOpId(userInfo.get("STAFF_ID").toString());
106
		workTask.setOpId(userInfo.get("STAFF_ID").toString());
142
		List<Map<String, Object>> resultList=aiAlarmManageService.queryAiAlarmCount(params);
142
		List<Map<String, Object>> resultList=aiAlarmManageService.queryAiAlarmCount(params);
143
		return CommonResponse.ok(resultList);
143
		return CommonResponse.ok(resultList);
144
	}
144
	}
145
	
145
146
}
146
}