From 4bff66cbe2f53d97766e190bdb0fbe131cadd900 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 18:25:28 +0800
Subject: [PATCH] 修改bug
---
/dev/null | 72 ------------------
UserIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java | 2
ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java | 12 +-
DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTracks.java | 9 ++
DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml | 5 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java | 3
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java | 95 ++++++-----------------
DriverIGOTravel/guns-admin/pom.xml | 8 +-
DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml | 9 +
11 files changed, 60 insertions(+), 159 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/pom.xml b/DriverIGOTravel/guns-admin/pom.xml
index dc38f9c..6cd6184 100644
--- a/DriverIGOTravel/guns-admin/pom.xml
+++ b/DriverIGOTravel/guns-admin/pom.xml
@@ -181,11 +181,11 @@
<artifactId>jjwt</artifactId>
</dependency>
<dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>2.9.0</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
-
+
+
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTracks.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTracks.java
index 542dab9..4980f2b 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTracks.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderTracks.java
@@ -1,7 +1,9 @@
package com.stylefeng.guns.modular.system.model;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
/**
@@ -15,9 +17,14 @@
/**
* 订单id
*/
- @TableField("id")
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
+ * 订单id
+ */
+ @TableField("orderId")
+ private Integer orderId;
+ /**
* 订单类型（1=打车，4=包裹）
*/
@TableField("orderType")
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 9c3cf12..c8ab080 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
@@ -108,15 +108,15 @@
String englishName = city1.getEnglishName();
String frenchName = city1.getFrenchName();
for (String s : city) {
- if(s.equals(chineseName)){
+ if(s.contains(chineseName)){
collect.add(city1.getId());
break;
}
- if(s.equals(englishName)){
+ if(s.contains(englishName)){
collect.add(city1.getId());
break;
}
- if(s.equals(frenchName)){
+ if(s.contains(frenchName)){
collect.add(city1.getId());
break;
}
@@ -148,15 +148,15 @@
String englishName = city1.getEnglishName();
String frenchName = city1.getFrenchName();
for (String s : city) {
- if(s.equals(chineseName)){
+ if(s.contains(chineseName)){
collect.add(city1.getId());
break;
}
- if(s.equals(englishName)){
+ if(s.contains(englishName)){
collect.add(city1.getId());
break;
}
- if(s.equals(frenchName)){
+ if(s.contains(frenchName)){
collect.add(city1.getId());
break;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
index e88dd45..fb171c0 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/FleetEngineUtil.java
@@ -730,8 +730,9 @@
}else{
if("ENROUTE_TO_DROPOFF".equals(tripStatus)){
OrderTracks orderTracks = new OrderTracks();
- orderTracks.setId(orderId);
+ orderTracks.setOrderId(orderId);
orderTracks.setOrderType(orderType);
+ orderTracks.setGoogleTracks(jsonObject.getString("route"));
orderTracksService.insert(orderTracks);
}
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
index b186f83..1fe7e92 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.stylefeng.guns.core.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -12,43 +13,32 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import java.util.concurrent.TimeUnit;
+
/**
* Redis工具类
*/
@Component
public class RedisUtil {
-
+
@Autowired
- private RestTemplate internalRestTemplate;
-
-
+ private RedisTemplate redisTemplate;
+
+
+
/**
* 向redis中存储字符串没有过期时间
* @param key
* @param value
*/
public void setStrValue(String key, String value){
- if(ToolUtil.isNotEmpty(key)){
- //发送验证码短信
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- //将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("key", key);
- params.add("value", value);
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/setValue_", requestEntity, String.class);
- JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
- if(jsonObject.getIntValue("code") != 200){
- System.err.println("调用redis出错了");
- }
+ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
+ redisTemplate.opsForValue().set(key, value);
}
-
}
-
-
+
+
/**
* 以分钟为单位设置存储值（设置过期时间）
* @param key
@@ -56,26 +46,12 @@
* @param time 秒
*/
public void setStrValue(String key, String value, int time){
- if(ToolUtil.isNotEmpty(key)){
- //发送验证码短信
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- //将请求头部和参数合成一个请求
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("key", key);
- params.add("value", value);
- params.add("time", String.valueOf(time));
- HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/setValue", requestEntity, String.class);
- JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
- if(jsonObject.getIntValue("code") != 200){
- System.err.println("调用redis出错了");
- }
+ if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
+ redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
}
}
-
-
+
+
/**
* 从redis中获取值
* @param key
@@ -83,45 +59,22 @@
*/
public String getValue(String key){
if(ToolUtil.isNotEmpty(key)){
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- //将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("key", key);
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/getValue",requestEntity , String.class);
- JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
- if(jsonObject.getIntValue("code") != 200){
- System.err.println("调用redis出错了");
- }
- return jsonObject.getString("data");
+ String data = (String) redisTemplate.opsForValue().get(key);
+ return data;
}
return null;
}
-
-
-
+
+
+
+
/**
* 删除key
* @param key
*/
- public String remove(String key){
+ public void remove(String key){
if(ToolUtil.isNotEmpty(key)){
- HttpHeaders headers = new HttpHeaders();
- // 以表单的方式提交
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- //将请求头部和参数合成一个请求
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.add("key", key);
- HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
- String s = internalRestTemplate.postForObject("http://zuul-gateway/redis/remove",requestEntity , String.class);
- JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
- if(jsonObject.getIntValue("code") != 200){
- System.err.println("调用redis出错了");
- }
- return jsonObject.getString("data");
+ redisTemplate.delete(key);
}
- return null;
}
}
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml b/DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml
index 900d4ce..88f3f88 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application-dev.yml
@@ -25,6 +25,11 @@
multipart:
max-request-size: 100MB
max-file-size: 100MB
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: 123456
mybatis-plus:
typeAliasesPackage: com.stylefeng.guns.modular
@@ -42,10 +47,10 @@
---
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/igotravel2.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
username: root
password: 123456
- db-name: guns #用来搜集数据库的所有表
+ db-name: igotravel #用来搜集数据库的所有表
filters: wall,mergeStat
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
index 235d49c..afcc0ce 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml
@@ -27,6 +27,11 @@
multipart:
max-request-size: 100MB
max-file-size: 100MB
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 16379
+ password: mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
mybatis-plus:
typeAliasesPackage: com.stylefeng.guns.modular
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/redis.properties b/DriverIGOTravel/guns-admin/src/main/resources/redis.properties
deleted file mode 100644
index bc6b0e9..0000000
--- a/DriverIGOTravel/guns-admin/src/main/resources/redis.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#redis���ÿ�ʼ
-# Redis���ݿ�������Ĭ��Ϊ0��
-spring.redis.database=0
-# Redis��������ַ
-spring.redis.host=127.0.0.1
-# Redis���������Ӷ˿�
-spring.redis.port=6379
-# Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=123456
-#spring.redis.password=
-# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
-spring.redis.jedis.pool.max-active=1024
-# ���ӳ���������ȴ�ʱ�䣨ʹ�ø�ֵ��ʾû�����ƣ�
-spring.redis.jedis.pool.max-wait=10000
-# ���ӳ��е�����������
-spring.redis.jedis.pool.max-idle=200
-# ���ӳ��е���С��������
-spring.redis.jedis.pool.min-idle=0
-# ���ӳ�ʱʱ�䣨���룩
-spring.redis.timeout=10000
-#redis���ý���
-spring.redis.block-when-exhausted=true
\ No newline at end of file
diff --git a/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java b/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
index 7bb9fd6..571c178 100644
--- a/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
+++ b/DriverIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
@@ -24,7 +24,7 @@
private Integer minIdle = 100;
- private Integer maxActive = 500;
+ private Integer maxActive = 100;
private Integer maxWait = 60000;
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
deleted file mode 100644
index 3760f4e..0000000
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.stylefeng.guns.modular.system.util;
-
-import com.stylefeng.guns.core.util.ToolUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.TimeUnit;
-
-
-/**
- * Redis工具类
- */
-@Component
-public class RedisUtil {
-
- @Autowired
- private RedisTemplate redisTemplate;
-
-
-
- /**
- * 向redis中存储字符串没有过期时间
- * @param key
- * @param value
- */
- public void setStrValue(String key, String value){
- if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
- redisTemplate.opsForValue().set(key, value);
- }
- }
-
-
- /**
- * 以分钟为单位设置存储值（设置过期时间）
- * @param key
- * @param value
- * @param time 秒
- */
- public void setStrValue(String key, String value, int time){
- if(ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(value)){
- redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
- }
- }
-
-
- /**
- * 从redis中获取值
- * @param key
- * @return
- */
- public String getValue(String key){
- if(ToolUtil.isNotEmpty(key)){
- String data = (String) redisTemplate.opsForValue().get(key);
- return data;
- }
- return null;
- }
-
-
-
-
- /**
- * 删除key
- * @param key
- */
- public void remove(String key){
- if(ToolUtil.isNotEmpty(key)){
- redisTemplate.delete(key);
- }
- }
-}
diff --git a/UserIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java b/UserIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
index 7bb9fd6..571c178 100644
--- a/UserIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
+++ b/UserIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java
@@ -24,7 +24,7 @@
private Integer minIdle = 100;
- private Integer maxActive = 500;
+ private Integer maxActive = 100;
private Integer maxWait = 60000;
diff --git a/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java b/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
index 6119873..22c81ff 100644
--- a/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
+++ b/ZuulIGOTravel/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
@@ -315,6 +315,8 @@
if(b){
NettyChannelMap.remove(ctx);
}
+ }else{
+ System.err.println("推送成功"+msg);
}
} catch (Exception e) {
System.err.println("推送发生异常，记录："+msg);
--
Gitblit v1.7.1