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/RsTrafficIndexServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java
index abc0e5a..9f3b116 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsTrafficIndexServiceImpl.java
@@ -1,24 +1,29 @@
package org.dromara.demo.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.demo.domain.RsTrafficIndex;
import org.dromara.demo.domain.bo.RsTrafficIndexBo;
import org.dromara.demo.domain.vo.RsTrafficIndexVo;
-import org.dromara.demo.domain.RsTrafficIndex;
import org.dromara.demo.mapper.RsTrafficIndexMapper;
import org.dromara.demo.service.IRsTrafficIndexService;
+import org.dromara.system.domain.SysOss;
+import org.dromara.system.mapper.SysOssMapper;
+import org.springframework.stereotype.Service;
+import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Collection;
+import java.util.stream.Collectors;
/**
* 浜ら�氭寚鏁癝ervice涓氬姟灞傚鐞�
@@ -31,6 +36,7 @@
public class RsTrafficIndexServiceImpl implements IRsTrafficIndexService {
private final RsTrafficIndexMapper baseMapper;
+ private final SysOssMapper sysOssMapper;
/**
* 鏌ヨ浜ら�氭寚鏁�
@@ -85,7 +91,7 @@
lqw.eq(bo.getTargetFourCompareValue() != null, RsTrafficIndex::getTargetFourCompareValue, bo.getTargetFourCompareValue());
lqw.eq(bo.getStatus() != null, RsTrafficIndex::getStatus, bo.getStatus());
lqw.like(StringUtils.isNotBlank(bo.getPeriodDate()), RsTrafficIndex::getPeriodDate, bo.getPeriodDate());
-
+ lqw.orderByDesc(RsTrafficIndex::getCreateTime);
return lqw;
}
@@ -100,6 +106,12 @@
if (flag) {
bo.setId(add.getId());
}
+ // 鍚敤鏂版暟鎹皢鎵�鏈夋暟鎹敼涓虹鐢�
+ if (bo.getStatus().equals(1)) {
+ LambdaUpdateWrapper<RsTrafficIndex> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.ne(RsTrafficIndex::getId, bo.getId()).set(RsTrafficIndex::getStatus, 2);
+ baseMapper.update(updateWrapper);
+ }
return flag;
}
@@ -109,7 +121,12 @@
@Override
public Boolean updateByBo(RsTrafficIndexBo bo) {
RsTrafficIndex update = MapstructUtils.convert(bo, RsTrafficIndex.class);
- validEntityBeforeSave(update);
+ // 鍚敤鏂版暟鎹皢鎵�鏈夋暟鎹敼涓虹鐢�
+ if (bo.getStatus().equals(1)) {
+ LambdaUpdateWrapper<RsTrafficIndex> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.ne(RsTrafficIndex::getId, bo.getId()).set(RsTrafficIndex::getStatus, 2);
+ baseMapper.update(updateWrapper);
+ }
return baseMapper.updateById(update) > 0;
}
@@ -130,4 +147,21 @@
}
return baseMapper.deleteBatchIds(ids) > 0;
}
+
+ @Override
+ public List<SysOss> icon() {
+ return baseMapper.icon();
+ }
+
+ @Override
+ public R<String> uploadIcon(List<SysOss> list) {
+ for (SysOss sysOss : list) {
+ if (sysOss.getUrl() != null) {
+ sysOssMapper.insertOrUpdate(sysOss);
+ } else {
+ sysOssMapper.deleteByTenantId(sysOss.getTenantId());
+ }
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.8.0