From 0d0980cfcff8127b5b0d366bc2f0460775aa351d Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 05 五月 2025 14:30:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 13 +++++++++++--
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java | 21 ++++++++++++++++-----
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java | 1 +
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcSettingServiceImpl.java | 2 ++
4 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcSettingServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcSettingServiceImpl.java
index 045e174..4c9cd07 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcSettingServiceImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/arc/service/impl/ArcSettingServiceImpl.java
@@ -31,6 +31,7 @@
@Override
public void update(ArcSettingEntity arcSettingEntity) {
+ arcSettingEntity.setUpdateTime(new Date());
arcPointSettingDao.updateById(arcSettingEntity);
}
@@ -55,6 +56,7 @@
@Override
public void add(ArcSettingEntity arcSettingEntity) {
+ arcSettingEntity.setCreateTime(new Date());
arcPointSettingDao.insert(arcSettingEntity);
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java
index 0731d9e..7bce221 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/channel/http/controller/admin/HttpTagController.java
@@ -30,6 +30,10 @@
import javax.validation.Valid;
import java.io.IOException;
import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import static com.iailab.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -49,16 +53,23 @@
@Resource
private HttpCollector httpCollector;
+ ThreadPoolExecutor threadPool = new ThreadPoolExecutor(18, 36, 30, TimeUnit.SECONDS,
+ new ArrayBlockingQueue<Runnable>(36), new ThreadPoolExecutor.AbortPolicy());
+
@PreAuthorize("@ss.hasPermission('data:channel-http:query')")
@GetMapping("page")
public CommonResult<PageResult<HttpTagRespVO>> page(@Valid HttpTagPageReqVO reqVO) {
PageResult<HttpTagEntity> page = tagService.queryPage(reqVO);
PageResult<HttpTagRespVO> pageResult = BeanUtils.toBean(page, HttpTagRespVO.class);
- pageResult.getList().forEach(item -> {
- item.setDataValue(httpCollector.getTagValue(item.getApiId(), item.getTagName()));
- item.setDataTime(new Date());
- item.setDataQuality(DataQualityEnum.getEumByValue(item.getDataValue()).getDesc());
- });
+ try {
+ pageResult.getList().forEach(item -> {
+ item.setDataValue(httpCollector.getTagValue(item.getApiId(), item.getTagName()));
+ item.setDataTime(new Date());
+ item.setDataQuality(DataQualityEnum.getEumByValue(item.getDataValue()).getDesc());
+ });
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
return success(pageResult);
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java
index dc5b09a..ffbc928 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/IndTimeLimitEnum.java
@@ -16,6 +16,7 @@
YESTERDAY("YESTERDAY", "昨天"),
LAST_DAY_7("LAST_DAY_7", "最近7天"),
LAST_DAY_30("LAST_DAY_30", "最近30天"),
+ LAST_DAY_90("LAST_DAY_90", "最近90天"),
THIS_MONTH("THIS_MONTH", "当前月"),
LAST_MONTH("LAST_MONTH", "上月"),
LAST_MONTH_12("LAST_MONTH_12", "最近12个月"),
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
index a2e3f09..30f6c76 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
@@ -18,8 +18,6 @@
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
-import java.time.YearMonth;
-import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
@@ -186,6 +184,17 @@
whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
+ case LAST_DAY_90:
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" <= '");
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
+ calendar.add(Calendar.DAY_OF_YEAR, -90);
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
+ whereSql.append("'");
+ break;
case THIS_MONTH:
whereSql.append(indItem.getTimeLabel());
whereSql.append("='");
--
Gitblit v1.9.3