From 280ca0c6a4a1e73ab4516d4850dedb5a43541594 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 20 一月 2025 15:25:31 +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 | 94 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 26 deletions(-)
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 c20dadd..e33849c 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
@@ -4,10 +4,11 @@
import com.iailab.module.data.common.enums.IndStatFuncEnum;
import com.iailab.module.data.common.enums.IndTimeLimitEnum;
import com.iailab.module.data.ind.data.dto.IndDataSetDTO;
-import com.iailab.module.data.ind.data.service.IndDataSetFieldService;
import com.iailab.module.data.ind.data.service.IndDataSetService;
+import com.iailab.module.data.ind.item.entity.IndItemEntity;
import com.iailab.module.data.ind.item.service.IndItemAtomService;
import com.iailab.module.data.ind.item.service.IndItemDerService;
+import com.iailab.module.data.ind.item.service.IndItemService;
import com.iailab.module.data.ind.item.vo.IndItemAtomVO;
import com.iailab.module.data.ind.item.vo.IndItemDerVO;
import com.iailab.module.data.ind.value.dto.QuerySourceValueDTO;
@@ -33,7 +34,7 @@
private IndDataSetService indDataSetService;
@Autowired
- private IndDataSetFieldService indDataSetFieldService;
+ private IndItemService indItemService;
@Autowired
private IndItemDerService indItemDerService;
@@ -50,13 +51,16 @@
if (indItem == null) {
return result;
}
+ IndItemEntity itemEntity = indItemService.get(itemId);
+ result.setItemNo(itemEntity.getItemNo());
+ result.setIndItemAtom(indItem);
IndDataSetDTO dataSet = indDataSetService.getDet(indItem.getDataSet());
if (dataSet == null) {
return result;
}
result.setDataSource(indItem.getDataSource());
StringBuilder selectSql = new StringBuilder();
- IndStatFuncEnum statFun = IndStatFuncEnum.getEumByCode(StringUtils.isBlank(indItem.getStatFunc())? IndStatFuncEnum.DEFAULT.getCode() : indItem.getStatFunc());
+ IndStatFuncEnum statFun = IndStatFuncEnum.getEumByCode(StringUtils.isBlank(indItem.getStatFunc()) ? IndStatFuncEnum.DEFAULT.getCode() : indItem.getStatFunc());
switch (statFun) {
case AVG:
selectSql.append("AVG(");
@@ -90,15 +94,19 @@
if (indItem == null) {
return result;
}
+ IndItemEntity itemEntity = indItemService.get(itemId);
+ result.setItemNo(itemEntity.getItemNo());
result = getAtomSql(indItem.getAtomItemId());
// 拼接SELECT
StringBuilder selectSql = new StringBuilder();
- if (StringUtils.isNotBlank(indItem.getDimension())){
+ if (StringUtils.isNotBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
selectSql.append(indItem.getDimension());
selectSql.append(", ");
selectSql.append(result.getSelectSql());
- }else{
+ } else if (StringUtils.isBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
+ selectSql.append(result.getSelectSql());
+ } else {
selectSql.append(result.getSelectSql());
selectSql.append(", ");
selectSql.append(indItem.getTimeLabel());
@@ -131,7 +139,9 @@
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
- whereSql.append("' AND >= '");
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
calendar.add(Calendar.DAY_OF_YEAR, -7);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
whereSql.append("'");
@@ -140,7 +150,9 @@
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
- whereSql.append("' AND >= '");
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
calendar.add(Calendar.DAY_OF_YEAR, -30);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
whereSql.append("'");
@@ -149,6 +161,18 @@
whereSql.append(indItem.getTimeLabel());
whereSql.append("='");
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
+ whereSql.append("'");
+ break;
+ case LAST_MONTH:
+ calendar.add(Calendar.MONTH, -1); // 将当前日期减去一个月，得到上个月的日期
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
+ whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 上个月的第一天
+ calendar.add(Calendar.MONTH, 1); // 再加一个月，回到当前月
+ whereSql.append("' AND '");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append("' < '");
+ whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 当前月
whereSql.append("'");
break;
case LAST_MONTH_12:
@@ -163,10 +187,13 @@
whereSql.append("'");
break;
case THIS_YEAR_MONTH:
- calendar.set(Calendar.MONTH, 11);
+ whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
+ calendar.set(Calendar.MONTH, 11);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
- whereSql.append("' AND >= '");
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
calendar.set(Calendar.MONTH, 0);
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
whereSql.append("'");
@@ -188,9 +215,9 @@
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
whereSql.append(DateUtils.format(indItem.getTimeEnd(), PATTERN_MON));
- whereSql.append("' AND '");
+ whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
- whereSql.append("' >= '");
+ whereSql.append(" >= '");
whereSql.append(DateUtils.format(indItem.getTimeStart(), PATTERN_MON));
whereSql.append("'");
break;
@@ -201,14 +228,14 @@
// 拼接GROUP
StringBuilder groupSql = new StringBuilder();
- if (StringUtils.isNotBlank(indItem.getDimension())){
+ if (StringUtils.isNotBlank(indItem.getDimension())) {
groupSql.append(indItem.getDimension());
}
result.setGroupSql(groupSql.toString());
// 拼接ORDER
StringBuilder orderBySql = new StringBuilder();
- if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())){
+ if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())) {
orderBySql.append(indItem.getTimeLabel());
result.setOrderBySql(orderBySql.toString());
}
@@ -223,14 +250,23 @@
}
result = getAtomSql(indItem.getAtomItemId());
+ IndItemEntity itemEntity = indItemService.get(itemId);
+ result.setItemNo(itemEntity.getItemNo());
+
// 拼接SELECT
StringBuilder selectSql = new StringBuilder();
- selectSql.append(indItem.getDimension());
- selectSql.append(", ");
- selectSql.append(result.getSelectSql());
- selectSql.append(", ");
- selectSql.append(indItem.getTimeLabel());
- selectSql.append(" data_time");
+ if (StringUtils.isNotBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
+ selectSql.append(indItem.getDimension());
+ selectSql.append(", ");
+ selectSql.append(result.getSelectSql());
+ } else if (StringUtils.isBlank(indItem.getDimension()) && StringUtils.isNotBlank(result.getIndItemAtom().getStatFunc())) {
+ selectSql.append(result.getSelectSql());
+ } else {
+ selectSql.append(result.getSelectSql());
+ selectSql.append(", ");
+ selectSql.append(indItem.getTimeLabel());
+ selectSql.append(" data_time");
+ }
result.setSelectSql(selectSql.toString());
// 拼接WHERE
@@ -238,22 +274,28 @@
whereSql.append(" ");
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
- whereSql.append(DateUtils.format(endTime, PATTERN_MON));
- whereSql.append("' AND >= '");
- whereSql.append(DateUtils.format(startTime, PATTERN_MON));
+ whereSql.append(DateUtils.format(endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
+ whereSql.append(DateUtils.format(startTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
whereSql.append("'");
result.setWhereSql(whereSql.toString());
// 拼接GROUP
StringBuilder groupSql = new StringBuilder();
- groupSql.append(" GROUP BY ");
- groupSql.append(indItem.getDimension());
+ if (StringUtils.isNotBlank(indItem.getDimension())) {
+ groupSql.append(indItem.getDimension());
+ }
result.setGroupSql(groupSql.toString());
// 拼接ORDER
StringBuilder orderBySql = new StringBuilder();
- orderBySql.append(indItem.getTimeLabel());
- result.setOrderBySql(orderBySql.toString());
+ if (StringUtils.isNotBlank(indItem.getDimension()) && indItem.getDimension().equals(indItem.getTimeLabel())) {
+ orderBySql.append(indItem.getTimeLabel());
+ result.setOrderBySql(orderBySql.toString());
+ }
+
return result;
}
}
\ No newline at end of file
--
Gitblit v1.9.3