From f0b9fe73049ff873a6da7127c60fd3e4f5b6f212 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 09:34:39 +0800
Subject: [PATCH] 点位标签
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 258f830..4cc8a0b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -28,6 +28,7 @@
import org.springframework.util.StringUtils;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -100,7 +101,6 @@
YwPoint entity = baseMapper.selectById(form.getId());
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
- entity.setPointTag(form.getPointTag().stream().collect(Collectors.joining(",")));
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -140,11 +140,6 @@
public Result page(YwPointQuery query) {
IPage<YwPointVO> page = PageUtil.getPage(query, YwPointVO.class);
baseMapper.page(page, query);
- page.getRecords().stream().forEach(point -> {
- if (StringUtils.hasText(point.getPointTagString())) {
- point.setPointTags(point.getPointTagString().split(","));
- }
- });
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -158,9 +153,6 @@
YwPoint entity = baseMapper.selectById(id);
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
- if (StringUtils.hasText(entity.getPointTag())) {
- vo.setPointTags(entity.getPointTag().split(","));
- }
if (Objects.nonNull(entity.getDeptId())) {
vo.setDeptIds(sysDeptMapper.selectParents(entity.getDeptId()));
}
@@ -208,11 +200,16 @@
}
@Override
- public boolean updateRecovery(List<Integer> pointIds, int recovery) {
+ public boolean updateRecovery(List<String> serialNumberList, int recovery) {
return new LambdaUpdateChainWrapper<>(baseMapper)
- .in(YwPoint::getId, pointIds)
+ .in(YwPoint::getSerialNumber, serialNumberList)
.set(YwPoint::getRecovery, recovery)
.set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate())
.update();
}
+
+ @Override
+ public List<YwPoint> home() {
+ return baseMapper.home();
+ }
}
--
Gitblit v1.8.0