From e17e3b7f70fa5abc8341e64f1ffce5813bae4bc3 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 21 三月 2024 18:02:43 +0800
Subject: [PATCH] 调整
---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
index 2fa4a3c..2f1aeb8 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsDangerInfoServiceImpl.java
@@ -8,6 +8,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
+import org.dromara.common.tenant.core.TenantEntity;
+import org.dromara.system.domain.SysOss;
+import org.dromara.system.mapper.SysOssMapper;
import org.springframework.stereotype.Service;
import org.dromara.demo.domain.bo.RsDangerInfoBo;
import org.dromara.demo.domain.vo.RsDangerInfoVo;
@@ -32,13 +35,16 @@
public class RsDangerInfoServiceImpl implements IRsDangerInfoService {
private final RsDangerInfoMapper baseMapper;
+ private final SysOssMapper sysOssMapper;
/**
* 鏌ヨ瀹夊叏闅愭偅淇℃伅
*/
@Override
public RsDangerInfoVo queryById(Long id){
- return baseMapper.selectVoById(id);
+ RsDangerInfoVo rsDangerInfoVo = baseMapper.selectVoById(id);
+ rsDangerInfoVo.setImgList(sysOssMapper.selectVoList(new LambdaQueryWrapper<SysOss>().eq(TenantEntity::getTenantId, rsDangerInfoVo.getId())));
+ return rsDangerInfoVo;
}
/**
@@ -65,7 +71,7 @@
LambdaQueryWrapper<RsDangerInfo> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getNotificationTime()), RsDangerInfo::getNotificationTime, bo.getNotificationTime());
lqw.eq(StringUtils.isNotBlank(bo.getDangerType()), RsDangerInfo::getDangerType, bo.getDangerType());
- lqw.eq(StringUtils.isNotBlank(bo.getAccountabilityUnit()), RsDangerInfo::getAccountabilityUnit, bo.getAccountabilityUnit());
+ lqw.like(StringUtils.isNotBlank(bo.getAccountabilityUnit()), RsDangerInfo::getAccountabilityUnit, bo.getAccountabilityUnit());
lqw.eq(StringUtils.isNotBlank(bo.getRectificationTimeLimit()), RsDangerInfo::getRectificationTimeLimit, bo.getRectificationTimeLimit());
lqw.eq(StringUtils.isNotBlank(bo.getPerformance()), RsDangerInfo::getPerformance, bo.getPerformance());
lqw.eq(bo.getStatus() != null, RsDangerInfo::getStatus, bo.getStatus());
@@ -84,6 +90,9 @@
if (flag) {
bo.setId(add.getId());
}
+ sysOssMapper.deleteByTenantId(bo.getId().toString());
+ bo.getImgList().forEach(tenant -> tenant.setTenantId(String.valueOf(bo.getId())));
+ sysOssMapper.insertBatch(bo.getImgList());
return flag;
}
@@ -93,7 +102,9 @@
@Override
public Boolean updateByBo(RsDangerInfoBo bo) {
RsDangerInfo update = MapstructUtils.convert(bo, RsDangerInfo.class);
- validEntityBeforeSave(update);
+ sysOssMapper.deleteByTenantId(bo.getId().toString());
+ bo.getImgList().forEach(tenant -> tenant.setTenantId(String.valueOf(bo.getId())));
+ sysOssMapper.insertBatch(bo.getImgList());
return baseMapper.updateById(update) > 0;
}
--
Gitblit v1.8.0