From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java
index 713130a..1b7f65e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/RegionServiceImpl.java
@@ -3,6 +3,7 @@
import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.Region;
import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.vo.RegionCascaderVO;
import com.ycl.platform.mapper.RegionMapper;
import com.ycl.platform.service.RegionService;
import com.ycl.system.Result;
@@ -10,6 +11,8 @@
import com.ycl.platform.domain.form.RegionForm;
import com.ycl.platform.domain.vo.RegionVO;
import com.ycl.platform.domain.query.RegionQuery;
+
+import java.util.Date;
import java.util.List;
import com.ycl.utils.DateUtils;
@@ -50,6 +53,9 @@
public Result add(RegionForm form) {
Region entity = RegionForm.getEntityByForm(form, null);
entity.setRegionLevel(RegionLevelEnum.STREET);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -65,10 +71,11 @@
public Result update(RegionForm form) {
Region entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
@@ -171,4 +178,34 @@
}).collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result cascader() {
+ List<Region> regionList = new LambdaQueryChainWrapper<>(baseMapper)
+ .ne(Region::getRegionLevel, RegionLevelEnum.CITY)
+ .list();
+ List<RegionCascaderVO> vos = regionList.stream().map(entity -> {
+ RegionCascaderVO vo = new RegionCascaderVO();
+ vo.setValue(entity.getId());
+ vo.setLabel(entity.getSimpleName());
+ vo.setRegionLevel(entity.getRegionLevel());
+ vo.setParentId(entity.getParentId());
+ return vo;
+ }).collect(Collectors.toList());
+ List<RegionCascaderVO> removeList = new ArrayList<>(12);
+ for (RegionCascaderVO region : vos) {
+ if (region.getRegionLevel() == RegionLevelEnum.COUNTY) {
+ List<RegionCascaderVO> childList = new ArrayList<>(12);
+ for (RegionCascaderVO region1 : vos) {
+ if (region1.getParentId() == region.getValue()) {
+ childList.add(region1);
+ removeList.add(region1);
+ }
+ }
+ region.setChildren(childList);
+ }
+ }
+ vos.removeAll(removeList);
+ return Result.ok().data(vos);
+ }
}
--
Gitblit v1.8.0