From 5e036b9e9d19b799a09dfab61ad0f85ff137f1d9 Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期一, 31 三月 2025 15:07:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java index 94b1e61..17646c2 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/collector/asdb/HttpCollectorForAsdc.java @@ -1,6 +1,7 @@ package com.iailab.module.data.channel.http.collector.asdb; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.iailab.framework.common.constant.CommonConstant; import com.iailab.framework.common.util.http.HttpUtils; import com.iailab.module.data.channel.http.collector.asdb.vo.HttpAsdbRespDataVO; @@ -61,7 +62,7 @@ List<HttpAsdbRespDataVO> dataList = JSON.parseArray(responseStr, HttpAsdbRespDataVO.class); log.info("存入IailabData缓存: " + catchKey); dataList.forEach(item -> { - redisTemplate.opsForValue().set(catchKey, item.getValue().toString(), offset, TimeUnit.SECONDS); + redisTemplate.opsForValue().set("IailabData:" + httpApi.getCode() + ":" + item.getPoint(), item.getValue().toString(), offset, TimeUnit.SECONDS); }); for (HttpAsdbRespDataVO data : dataList){ if (tagNo.equals(data.getPoint())){ @@ -104,7 +105,10 @@ } private void getByHtp(String url, String sourceName, Map<String, Object> result, List<Object[]> params) { + log.info("HttpCollectorForAsdc.getByHtp:url=" + url); + log.info("HttpCollectorForAsdc.getByHtp:params=" + JSONArray.toJSONString(params)); String responseStr = HttpUtils.sendGet(url, null, ""); + log.info("HttpCollectorForAsdc.getByHtp:responseStr=" + responseStr); List<HttpAsdbRespDataVO> dataList = JSON.parseArray(responseStr, HttpAsdbRespDataVO.class); Map<String, HttpAsdbRespDataVO> valueGroup = new HashMap<>(); for (HttpAsdbRespDataVO data : dataList) { -- Gitblit v1.9.3