From 3af9c82375df6bd77ae78a5d900c409a895ecd18 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:10:16 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index 806e14c..73cdfc4 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -100,12 +101,25 @@
@Override
public Company query(String[] city) throws Exception {
- List<Company> query = companyMapper.queryList(city, 3);
+ List<City> cities1 = cityService.selectList(null);
+ List<Integer> collect = new ArrayList<>();
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.indexOf(chineseName) != -1 || s.indexOf(englishName) != -1 || s.indexOf(frenchName) != -1){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
+ List<Company> query = companyMapper.queryList(collect, 3);
if(query.size() == 0){
- query = companyMapper.queryList(city, 2);
+ query = companyMapper.queryList(collect, 2);
}
if(query.size() == 0){
- query = companyMapper.queryList(city, 1);
+ query = companyMapper.queryList(collect, 1);
}
if(query.size() > 0){
return query.get(0);
@@ -116,9 +130,19 @@
public Company query1(String[] city) throws Exception {
- List<City> cities = cityService.selectList(new EntityWrapper<City>().in("chineseName", Arrays.asList(city)).or()
- .in("englishName", Arrays.asList(city)).or().in("frenchName", Arrays.asList(city)));
- List<Integer> collect = cities.stream().map(City::getId).collect(Collectors.toList());
+ List<City> cities1 = cityService.selectList(null);
+ List<Integer> collect = new ArrayList<>();
+ for (City city1 : cities1) {
+ String chineseName = city1.getChineseName();
+ String englishName = city1.getEnglishName();
+ String frenchName = city1.getFrenchName();
+ for (String s : city) {
+ if(s.indexOf(chineseName) != -1 || s.indexOf(englishName) != -1 || s.indexOf(frenchName) != -1){
+ collect.add(city1.getId());
+ break;
+ }
+ }
+ }
if(collect.size() == 0){
return null;
}
--
Gitblit v1.7.1