From a9485e6e68e6ebbcfd95d30c4635d77809c5b2c3 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 26 五月 2025 16:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfMainServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfMainServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfMainServiceImpl.java
index efbd0c9..937f795 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfMainServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestSnapshotConfMainServiceImpl.java
@@ -1,23 +1,19 @@
package com.iailab.module.model.mcs.sche.service.impl;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.core.metadata.IPage;
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.module.model.mcs.sche.dao.StSuggestSnapshotConfMainDao;
-import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainDetEntity;
+import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
-import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
-import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainDetService;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainSaveReqVO;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
import java.util.UUID;
@@ -29,9 +25,8 @@
implements StSuggestSnapshotConfMainService {
@Override
- public PageResult<StSuggestSnapshotConfMainRespVO> page(StSuggestSnapshotConfMainPageReqVO reqVO) {
- IPage<StSuggestSnapshotConfMainRespVO> page = baseDao.selectPage(reqVO);
- return new PageResult<>(page.getRecords(), page.getTotal());
+ public PageResult<StSuggestSnapshotConfMainEntity> page(StSuggestSnapshotConfMainPageReqVO reqVO) {
+ return baseDao.selectPage(reqVO);
}
@Override
@@ -54,4 +49,14 @@
public void delete(String id) {
baseDao.deleteById(id);
}
+
+ @Override
+ public StSuggestSnapshotConfMainRespVO getByModelIdAndScheduleObj(String modelId, String scheduleObj) {
+ return ConvertUtils.sourceToTarget( baseDao.selectOne("model_id", modelId, "schedule_obj", scheduleObj), StSuggestSnapshotConfMainRespVO.class);
+ }
+
+ @Override
+ public StSuggestSnapshotConfMainRespVO get(String id) {
+ return ConvertUtils.sourceToTarget( baseDao.selectById(id), StSuggestSnapshotConfMainRespVO.class);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3