From 1d02b4887665a616697af9bd92885ba6db4ed838 Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期三, 19 二月 2025 14:11:05 +0800 Subject: [PATCH] 新增固化标识,新增保存指标历史值job,以及查询指标历史值功能 --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/value/service/impl/IndItemValueServiceImpl.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/value/service/impl/IndItemValueServiceImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/value/service/impl/IndItemValueServiceImpl.java index 9a9e4e5..2453ea2 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/value/service/impl/IndItemValueServiceImpl.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/value/service/impl/IndItemValueServiceImpl.java @@ -3,6 +3,11 @@ import com.iailab.framework.common.pojo.PageResult; import com.iailab.framework.common.service.impl.BaseServiceImpl; import com.iailab.framework.common.util.object.BeanUtils; +import com.iailab.framework.common.util.object.ConvertUtils; +import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.iailab.framework.tenant.core.context.DataContextHolder; +import com.iailab.module.data.common.utils.DateUtils; +import com.iailab.module.data.common.xss.SQLFilter; import com.iailab.module.data.ind.item.vo.IndItemValueVO; import com.iailab.module.data.ind.value.dao.IndItemValueDao; import com.iailab.module.data.ind.value.dto.QuerySourceValueDTO; @@ -14,7 +19,6 @@ import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; import java.util.UUID; /** @@ -64,8 +68,23 @@ log.warn("数据源不能为空"); return null; } - - + SQLFilter.sqlInject2(dto.getSelectSql()); + SQLFilter.sqlInject2(dto.getViewSql()); + SQLFilter.sqlInject2(dto.getWhereSql()); + SQLFilter.sqlInject2(dto.getGroupSql()); + SQLFilter.sqlInject2(dto.getGroupSql()); + DataContextHolder.setDataSourceId(Long.valueOf(dto.getDataSource())); return baseDao.getSourceValue(dto); } + + @Override + public List<IndItemValueVO> getValueList(IndItemValuePageReqVO reqVO) { + List<IndItemValueEntity> entities = baseDao.selectList( new LambdaQueryWrapperX<IndItemValueEntity>() + .eq(StringUtils.isNotBlank(reqVO.getItemNo()), IndItemValueEntity::getItemNo, reqVO.getItemNo()) + .geIfPresent(IndItemValueEntity::getDataTime, DateUtils.stringToDate(reqVO.getStartTime(), DateUtils.DATE_TIME_PATTERN)) + .leIfPresent(IndItemValueEntity::getDataTime, DateUtils.stringToDate(reqVO.getEndTime(), DateUtils.DATE_TIME_PATTERN)) + .orderByDesc(IndItemValueEntity::getDataTime) + ); + return ConvertUtils.sourceToTarget(entities, IndItemValueVO.class); + } } \ No newline at end of file -- Gitblit v1.9.3