告警平台对接
							parent
							
								
									7d816e91b9
								
							
						
					
					
						commit
						49501e1d1c
					
				|  | @ -98,16 +98,15 @@ public class IndexServiceImpl implements IndexService { | ||||||
|             //获取用户数据权限申请数量
 |             //获取用户数据权限申请数量
 | ||||||
|             JSONObject userParam = new JSONObject(); |             JSONObject userParam = new JSONObject(); | ||||||
|             userParam.put("userId", "1111"); |             userParam.put("userId", "1111"); | ||||||
|             String userDataAuthStr = ykUtil.call(YkInfo.getCountTaskByUser, userParam, JSONArray.class); |             String data = ykUtil.call(YkInfo.getCountTaskByUser, userParam, JSONArray.class); | ||||||
|             List<JSONObject> userDataJAuthJson = JSONObject.parseObject(userDataAuthStr, List.class); |             List<JSONObject> list = JSONObject.parseObject(data, List.class); | ||||||
|             List<JSONObject> authResList = JSONObject.parseObject(userDataJAuthJson.get(0).getString("authRes"),List.class); |  | ||||||
| 
 | 
 | ||||||
|             String result = warnUtil.call(WarnInfo.get1DayWarnCount.getUrl(), "GET"); |             String result = warnUtil.call(WarnInfo.get1DayWarnCount.getUrl(), "GET"); | ||||||
|             log.info("result:"+result); |             log.info("result:" + result); | ||||||
| 
 | 
 | ||||||
| //            log.info("resultMap:{}", JSON.toJSONString(resultMap));
 | //            log.info("resultMap:{}", JSON.toJSONString(resultMap));
 | ||||||
| 
 | 
 | ||||||
|             return new GeneralResult(true, "查询成功"); |             return new GeneralResult(true, list, "查询成功"); | ||||||
|         } catch (Exception e) { |         } catch (Exception e) { | ||||||
|             log.info("查询失败", e); |             log.info("查询失败", e); | ||||||
|             return new GeneralResult(false, "查询失败"); |             return new GeneralResult(false, "查询失败"); | ||||||
|  | @ -131,9 +130,9 @@ public class IndexServiceImpl implements IndexService { | ||||||
|             List<JSONObject> userAppList = getUserAppList(requestContext); |             List<JSONObject> userAppList = getUserAppList(requestContext); | ||||||
|             List<String> appIdList = userAppList.stream().map(jsonObject -> jsonObject.getString("appId")).collect(Collectors.toList()); |             List<String> appIdList = userAppList.stream().map(jsonObject -> jsonObject.getString("appId")).collect(Collectors.toList()); | ||||||
|             for (JSONObject data : allAppList) { |             for (JSONObject data : allAppList) { | ||||||
|                 if(appIdList.contains(data.getString("appId"))){ |                 if (appIdList.contains(data.getString("appId"))) { | ||||||
|                     data.put("enable", "1"); |                     data.put("enable", "1"); | ||||||
|                 }else{ |                 } else { | ||||||
| 
 | 
 | ||||||
|                     data.put("enable", "0"); |                     data.put("enable", "0"); | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue