Ver Código Fonte

提交git空格问题

wangchao 4 anos atrás
pai
commit
d62d029c61

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

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