From 8399270e3f12301ddf143c87bec9ca1be7b54ff0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 11:05:18 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml | 2
MessagePushTravel/src/main/java/com/sinata/push/config/QYTConfig.java | 33 +++++++++++
MessagePushTravel/src/main/resources/application-produce.yml | 23 +++++++
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 5 -
UserQYTTravel/guns-admin/src/main/resources/application-produce.yml | 2
MessagePushTravel/src/main/resources/application-dev.yml | 19 ++++++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 15 +++-
MessagePushTravel/src/main/resources/application-test.yml | 23 +++++++
8 files changed, 113 insertions(+), 9 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 1fd04c3..612d803 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -29,7 +29,6 @@
import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
-import io.rong.models.response.TokenResult;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
@@ -563,8 +562,8 @@
loginWarpper.setToken(token);
loginWarpper.setAppid(UUIDUtil.getRandomCode());
loginWarpper.setState(ToolUtil.isEmpty(driver.getIdCard()) ? 1 : 0);
- TokenResult token1 = RongCloudUtil.getToken(driver.getId().toString(), driver.getName(), driver.getHeadImgUrl());
- loginWarpper.setRongYunToken(token1.getToken());
+// TokenResult token1 = RongCloudUtil.getToken(driver.getId().toString(), driver.getName(), driver.getHeadImgUrl());
+// loginWarpper.setRongYunToken(token1.getToken());
//创建高德猎鹰的终端数据
// String tid = gdFalconUtil.createTerminal(phone);
diff --git a/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml b/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml
index 20f894e..afcaef7 100644
--- a/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml
+++ b/DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml
@@ -115,7 +115,7 @@
#支付回调地址
#正式环境
-callbackPath: https://traffic.qytzt.cn/chuxing/driver
+callbackPath: https://traffic.qytzt.cn/chuxing/driver-server
---
#交通部推送数据功能开关
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 876fd9b..77c2f1f 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -339,9 +339,13 @@
if (count > 0) {
return "error";
}
+ if(ToolUtil.isEmpty(tCompany.getIdentifier())){
+ return "统一社会信用代码不能为空";
+ }
//调用中台接口创建企业
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
- String enterCode = "";
+// CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
+ String enterCode = "";
Integer enterNew = null;
Long empId = null;
Integer empnew = null;
@@ -497,7 +501,7 @@
TCompany tCompany = tCompanyService.selectById(tCompanyId);
//调用中台接口创建企业
if(1 == tCompany.getEnterNew()){
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
ShiroUser user1 = shiroExtUtil.getUser();
User user = userService.selectById(user1.getId());
@@ -574,8 +578,11 @@
if (count > 0) {
return "error";
}
+ if(ToolUtil.isEmpty(tCompany.getIdentifier())){
+ return "统一社会信用代码不能为空";
+ }
//调用中台接口创建企业
- CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist(tCompany.getName());
+ CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterExistByEnterIdCardNo(tCompany.getIdentifier());
String enterCode = "";
Long empId = null;
Integer empnew = null;
diff --git a/MessagePushTravel/src/main/java/com/sinata/push/config/QYTConfig.java b/MessagePushTravel/src/main/java/com/sinata/push/config/QYTConfig.java
new file mode 100644
index 0000000..6042559
--- /dev/null
+++ b/MessagePushTravel/src/main/java/com/sinata/push/config/QYTConfig.java
@@ -0,0 +1,33 @@
+package com.sinata.push.config;
+
+import com.sinata.push.util.echo.NettyServerController;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @author zhibing.pu
+ * @Date 2025/8/12 13:58
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "qyt")
+public class QYTConfig {
+ /**
+ * 出行网关接口地址
+ */
+ private String chuxingUrl;
+ /**
+ * 代驾网关接口地址
+ */
+ private String daijiaurl;
+
+
+ @PostConstruct
+ public void init() {
+ NettyServerController.setQytConfig(this);
+ }
+}
diff --git a/MessagePushTravel/src/main/resources/application-dev.yml b/MessagePushTravel/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..46cf687
--- /dev/null
+++ b/MessagePushTravel/src/main/resources/application-dev.yml
@@ -0,0 +1,19 @@
+server:
+ port: 6000
+spring:
+ profiles:
+ active: dev
+ application:
+ name: message #服务名称
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+ redis:
+ host: 192.168.110.80
+ port: 6379
+ password: 123456
+
+qyt:
+ chuxing_url: http://192.168.110.85:5000
+ daijia_url: http://192.168.110.106:3002
\ No newline at end of file
diff --git a/MessagePushTravel/src/main/resources/application-produce.yml b/MessagePushTravel/src/main/resources/application-produce.yml
new file mode 100644
index 0000000..4840848
--- /dev/null
+++ b/MessagePushTravel/src/main/resources/application-produce.yml
@@ -0,0 +1,23 @@
+server:
+ port: 6000
+spring:
+ profiles:
+ active: prod
+ application:
+ name: message #服务名称
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+ redis:
+ host: 10.31.1.219
+ port: 6410
+ password: Qnz_jt@20#25
+ database: 0
+ timeout: 1000
+ cluster:
+ nodes: 10.31.1.219:6410,10.31.1.30:6410,10.31.1.97:6411
+
+qyt:
+ chuxing_url: http://10.31.182.11:8010/chuxing
+ daijia_url: http://10.31.182.11:8010/daijia
\ No newline at end of file
diff --git a/MessagePushTravel/src/main/resources/application-test.yml b/MessagePushTravel/src/main/resources/application-test.yml
new file mode 100644
index 0000000..b94ec30
--- /dev/null
+++ b/MessagePushTravel/src/main/resources/application-test.yml
@@ -0,0 +1,23 @@
+server:
+ port: 6000
+spring:
+ profiles:
+ active: test
+ application:
+ name: message #服务名称
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+ redis:
+ host: 10.88.154.24
+ port: 7560
+ password: Idcs_B_2025rd141
+ database: 0
+ timeout: 1000
+ cluster:
+ nodes: 10.88.154.24:7560,10.88.154.34:7560,10.88.154.59:7560,10.88.154.98:7560,10.88.154.100:7560,10.88.154.109:7560
+
+qyt:
+ chuxing_url: http://10.88.188.65:8010/chuxing
+ daijia_url: http://10.88.188.65:8010/daijia
\ No newline at end of file
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application-produce.yml b/UserQYTTravel/guns-admin/src/main/resources/application-produce.yml
index ac29254..0f84cd1 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/application-produce.yml
+++ b/UserQYTTravel/guns-admin/src/main/resources/application-produce.yml
@@ -109,7 +109,7 @@
#支付回调地址
#正式环境
-callbackPath: https://traffic.qytzt.cn/chuxing/user
+callbackPath: https://traffic.qytzt.cn/chuxing/user-server
---
--
Gitblit v1.7.1