From 0a2b23ad3f30dfb01c5d590fb98f39e93bfe1932 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 31 十二月 2024 18:35:17 +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/StScheduleModelServiceImpl.java |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleModelServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleModelServiceImpl.java
index c41ed67..2932e85 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleModelServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleModelServiceImpl.java
@@ -1,11 +1,12 @@
 package com.iailab.module.model.mcs.sche.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.module.model.mcs.sche.dao.StScheduleModelDao;
 import com.iailab.module.model.mcs.sche.entity.StScheduleModelEntity;
+import com.iailab.module.model.mcs.sche.service.StScheduleModelOutService;
 import com.iailab.module.model.mcs.sche.service.StScheduleModelParamService;
 import com.iailab.module.model.mcs.sche.service.StScheduleModelService;
 import com.iailab.module.model.mcs.sche.service.StScheduleModelSettingService;
@@ -16,6 +17,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -23,7 +26,10 @@
  * @date 2021年07月20日 14:23
  */
 @Service
-public class StScheduleModelServiceImpl extends BaseServiceImpl<StScheduleModelDao, StScheduleModelEntity> implements StScheduleModelService {
+public class StScheduleModelServiceImpl implements StScheduleModelService {
+
+    @Resource
+    private StScheduleModelDao stScheduleModelDao;
 
     @Autowired
     private StScheduleModelParamService stScheduleModelParamService;
@@ -31,41 +37,54 @@
     @Autowired
     private StScheduleModelSettingService stScheduleModelSettingService;
 
+    @Autowired
+    private StScheduleModelOutService stScheduleModelOutService;
+
     @Override
     public PageResult<StScheduleModelEntity> page(StScheduleModelPageReqVO reqVO) {
-        return baseDao.selectPage(reqVO);
+        return stScheduleModelDao.selectPage(reqVO);
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    public List<StScheduleModelEntity> list() {
+
+        return stScheduleModelDao.selectList(null);
+    }
+
+    @Override
+    @DSTransactional(rollbackFor = Exception.class)
     public void create(StScheduleModelSaveReqVO reqVO) {
         StScheduleModelEntity entity = BeanUtils.toBean(reqVO, StScheduleModelEntity.class);
         entity.setId(UUID.randomUUID().toString());
-        baseDao.insert(entity);
+        stScheduleModelDao.insert(entity);
         stScheduleModelParamService.saveList(entity.getId(), reqVO.getParamList());
+        stScheduleModelOutService.insertList(reqVO.getModelOut(), entity.getId());
         stScheduleModelSettingService.saveList(entity.getId(), reqVO.getSettingList());
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional(rollbackFor = Exception.class)
     public void update(StScheduleModelSaveReqVO reqVO) {
         StScheduleModelEntity entity = BeanUtils.toBean(reqVO, StScheduleModelEntity.class);
-        baseDao.updateById(entity);
+        stScheduleModelDao.updateById(entity);
         stScheduleModelParamService.saveList(entity.getId(), reqVO.getParamList());
         stScheduleModelSettingService.saveList(entity.getId(), reqVO.getSettingList());
+        stScheduleModelOutService.deleteScheduleModelOut(entity.getId());
+        stScheduleModelOutService.insertList(reqVO.getModelOut(), entity.getId());
     }
 
     @Override
     public StScheduleModelEntity get(String id) {
-        return baseDao.selectById(id);
+        return stScheduleModelDao.selectById(id);
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional(rollbackFor = Exception.class)
     public void delete(String id) {
-        baseDao.deleteById(id);
+        stScheduleModelDao.deleteById(id);
         stScheduleModelParamService.deleteByModelId(id);
         stScheduleModelSettingService.deleteByModelId(id);
+        stScheduleModelOutService.deleteScheduleModelOut(id);
     }
 
     @Override
@@ -75,12 +94,12 @@
         QueryWrapper<StScheduleModelEntity> scheduleModelWrapper = new QueryWrapper<>();
         scheduleModelWrapper.ne(StringUtils.isNotBlank(id), "id", id);
         scheduleModelWrapper.and(wrapper -> wrapper.eq("model_name", modelname));
-        return baseDao.selectCount(scheduleModelWrapper);
+        return stScheduleModelDao.selectCount(scheduleModelWrapper);
     }
 
     @Override
     public Long count() {
         QueryWrapper<StScheduleModelEntity> wrapper = new QueryWrapper<>();
-        return baseDao.selectCount(wrapper);
+        return stScheduleModelDao.selectCount(wrapper);
     }
 }

--
Gitblit v1.9.3