From 9d81f6179a527eeef8ba9b567ed06e01b70ed062 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 27 Nov 2025 10:03:27 +0800
Subject: [PATCH] 1.哈尔滨增加，另一个Minio配置。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java
index 186485f..61e1b6f 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java
@@ -3,13 +3,16 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import com.ard.common.annotation.DataScope;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.route.domain.route.ArdRouteGroup;
+import com.ard.route.domain.vo.ArdRouteGroupVo;
import com.ard.route.mapper.ArdRouteGroupMapper;
import com.ard.route.mapper.ArdRouteInfoMapper;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.service.IArdRouteGroupService;
@@ -53,8 +56,8 @@
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdRouteGroup> selectArdRouteGroupList(ArdRouteGroup ardRouteGroup) {
List<ArdRouteGroup> list = ardRouteGroupMapper.selectArdRouteGroupList(ardRouteGroup);
- for (ArdRouteGroup routeGrouping : list) {
- routeGrouping.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupId(routeGrouping.getId()));
+ for (ArdRouteGroup routeGroup : list) {
+ routeGroup.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupId(routeGroup.getId()));
}
return list;
}
@@ -111,11 +114,11 @@
try {
// 先删除航线信息
int informationCount = ardRouteInfoMapper.deleteRouteInforByGroupIds(ids);
- result.put("informationCount", informationCount);
+ result.put("infoCount", informationCount);
// 再删除分组
- int groupingCount = ardRouteGroupMapper.deleteArdRouteGroupByIds(ids);
- result.put("groupingCount", groupingCount);
+ int groupCount = ardRouteGroupMapper.deleteArdRouteGroupByIds(ids);
+ result.put("groupCount", groupCount);
return result;
} catch (Exception e) {
@@ -134,4 +137,21 @@
return ardRouteGroupMapper.deleteArdRouteGroupById(id);
}
+ /**
+ * 分组列表
+ *
+ * @param ardRouteGroup 分组
+ * @return 分组集合
+ */
+ @Override
+ public List<ArdRouteGroupVo> selectGroupList(ArdRouteGroup ardRouteGroup) {
+ return ardRouteGroupMapper.selectArdRouteGroupList(ardRouteGroup).stream()
+ .map(entity -> {
+ ArdRouteGroupVo vo = new ArdRouteGroupVo();
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ })
+ .collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.3