From e54ce4959bca1fdeda01701989f8debd9467d4bd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 03 一月 2025 10:08:20 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java
index 42b9252..58e5c42 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictAlarmConfigServiceImpl.java
@@ -5,17 +5,15 @@
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.security.core.util.SecurityFrameworkUtils;
import com.iailab.module.model.api.mcs.dto.AlarmConfigRespDTO;
import com.iailab.module.model.mcs.pre.dao.MmPredictAlarmConfigDao;
-import com.iailab.module.model.mcs.pre.entity.DmModuleEntity;
import com.iailab.module.model.mcs.pre.entity.MmPredictAlarmConfigEntity;
-import com.iailab.module.model.mcs.pre.entity.MmPredictAlarmMessageEntity;
import com.iailab.module.model.mcs.pre.service.MmPredictAlarmConfigService;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigPageReqVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigRespVO;
import com.iailab.module.model.mcs.pre.vo.MmPredictAlarmConfigSaveReqVO;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -66,6 +64,7 @@
public List<AlarmConfigRespDTO> list(Map<String, Object> params) {
QueryWrapper<MmPredictAlarmConfigEntity> wrapper = new QueryWrapper<>();
wrapper.eq("is_enable", 1);
- return BeanUtils.toBean(baseDao.selectList(wrapper), AlarmConfigRespDTO.class);
+ List<MmPredictAlarmConfigEntity> list = baseDao.selectList(wrapper);
+ return ConvertUtils.sourceToTarget(list, AlarmConfigRespDTO.class);
}
}
\ No newline at end of file
--
Gitblit v1.9.3