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 | 131 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 49 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 d5f7ce6..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
@@ -1,21 +1,28 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.CompanyCityMapper;
import com.stylefeng.guns.modular.system.dao.CompanyMapper;
+import com.stylefeng.guns.modular.system.model.City;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.CompanyCity;
+import com.stylefeng.guns.modular.system.service.ICityService;
import com.stylefeng.guns.modular.system.service.ICompanyCityService;
import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
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;
+import java.util.stream.Collectors;
@Service
@@ -25,81 +32,107 @@
private CompanyMapper companyMapper;
@Autowired
- private GDMapGeocodingUtil gdMapGeocodingUtil;
+ private ICityService cityService;
+
+ @Resource
+ private RedisUtil redisUtil;
- /**
- * 根据经纬度获取所属企业
- * @param lon
- * @param lat
- * @return
- * @throws Exception
- */
- @Override
- public Company query(String lon, String lat) throws Exception {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(String.valueOf(lon), String.valueOf(lat));
- String districtCode = geocode.get("districtCode");
- Company query = this.query(districtCode);
- return query;
- }
@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;
}
AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
- String[] city = new String[addressComponentsVos.length];
+ String[] citys = new String[addressComponentsVos.length];
for (int i = 0; i < addressComponentsVos.length; i++) {
- city[i] = addressComponentsVos[i].getLongName();
+ citys[i] = addressComponentsVos[i].getLongName();
}
- Company query = this.query(city);
+ Company query = this.query(citys);
return query;
}
- /**
- * 根据行政编号获取所属企业
- * @param code
- * @return
- * @throws Exception
- */
- @Override
- public Company query(String code) throws Exception {
- String province = code.substring(0, 2) + "0000";
- String city = code.substring(0, 4) + "00";
- List<Company> query = companyMapper.query(province, city, code);
- if(query.size() == 0){
- query = companyMapper.query(province, city, null);
- }
- if(query.size() == 0){
- query = companyMapper.query(province, null, null);
- }
- for(int i = 3; i > 0; i--){
- for(Company company : query){
- if(company.getType() == i){
- return company;
- }
- }
- }
- return null;
- }
@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;
+ }
+ }
+ }
+ 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.queryList(city, 2);
+ query = companyMapper.queryList1(collect, 2);
}
if(query.size() == 0){
- query = companyMapper.queryList(city, 1);
+ 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