From b5bab032e80f0233fdf06a4e8de2599bc6b65e47 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 21:23:56 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIndexMenuServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIndexMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIndexMenuServiceImpl.java
index 90fea1f..adf3b07 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIndexMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIndexMenuServiceImpl.java
@@ -1,17 +1,21 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.TIndexMenu;
+import com.ruoyi.system.domain.TTitleMajor;
import com.ruoyi.system.dto.AllertTitleDto;
import com.ruoyi.system.mapper.TIndexMenuMapper;
+import com.ruoyi.system.mapper.TTitleMajorMapper;
import com.ruoyi.system.service.TIndexMenuService;
+import com.ruoyi.system.service.TTitleMajorService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -24,9 +28,23 @@
@Service
public class TIndexMenuServiceImpl extends ServiceImpl<TIndexMenuMapper, TIndexMenu> implements TIndexMenuService {
+ @Autowired
+ private TTitleMajorMapper titleMajorMapper;
+
@Override
public List<AllertTitleDto> allert(List<String> cityCode) {
- return this.baseMapper.allert(cityCode);
+ List<AllertTitleDto> allert = new ArrayList<>();
+ for (String s : cityCode) {
+ List<AllertTitleDto> allert1 = this.baseMapper.allert(Collections.singletonList(s));
+ allert.addAll(allert1);
+ }
+ allert = allert.stream().distinct().collect(Collectors.toList());
+ for (AllertTitleDto allertTitleDto : allert) {
+ List<TTitleMajor> tTitleMajors = titleMajorMapper.selectList(Wrappers.lambdaQuery(TTitleMajor.class)
+ .eq(TTitleMajor::getTechnicalId, allertTitleDto.getId()));
+ allertTitleDto.setChildren(tTitleMajors);
+ }
+ return allert;
}
@Override
--
Gitblit v1.7.1