From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
index 50f2f19..3b60ce1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java
@@ -13,10 +13,12 @@
import com.stylefeng.guns.modular.system.util.GoogleMap.AddressComponentsVo;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -31,13 +33,17 @@
@Autowired
private ICityService cityService;
+
+ @Resource
+ private RedisUtil redisUtil;
@Override
- public Company query1(String lon, String lat) throws Exception {
- ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(lat), Double.valueOf(lon));
+ public Company query1(Integer uid, String lon, String lat) throws Exception {
+ String tripId = redisUtil.getValue("trip" + uid);
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(lat), Double.valueOf(lon), tripId);
if(null == reverseGeocode){
return null;
}
@@ -55,9 +61,78 @@
@Override
public Company query(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;
+ }
return companyMapper.query(collect);
}
+
+
+ @Override
+ public Company query1(String[] city) throws Exception {
+ 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.queryList1(collect, 3);
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 2);
+ }
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 1);
+ }
+ if(query.size() > 0){
+ return query.get(0);
+ }
+ return null;
+ }
+
+
+
+ @Override
+ public List<Company> query2(String[] city) throws Exception {
+ 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.queryList1(collect, 3);
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 2);
+ }
+ if(query.size() == 0){
+ query = companyMapper.queryList1(collect, 1);
+ }
+ return query;
+ }
}
--
Gitblit v1.7.1