From c697e0a7466b64855f5f799a1fbf7d97a3b8ed49 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 15 八月 2024 10:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/application-prod.yml | 30 ++++++--------
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 7 +++
ycl-server/src/main/resources/application-dev.yml | 32 +++++++--------
pom.xml | 6 +++
4 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6506610..7d28752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,12 @@
</dependencyManagement>
<dependencies>
+ <!-- sip鍗忚鏍� -->
+ <dependency>
+ <groupId>javax.sip</groupId>
+ <artifactId>jain-sip-ri</artifactId>
+ <version>1.3.0-91</version>
+ </dependency>
<!-- 娴峰悍client -->
<dependency>
<groupId>com.hikvision.ga</groupId>
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 3899c27..020946c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -80,6 +80,9 @@
workOrderList.stream().filter(item -> {
return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType());
});
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ return Boolean.TRUE;
+ }
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper)
@@ -128,6 +131,7 @@
YwPoint point = pointMapping.get(workOrder.getSerialNumber());
if (Objects.isNull(point)) {
notAddList.add(workOrder);
+ continue;
}
workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
@@ -138,6 +142,9 @@
}
}
waitAddList.removeAll(notAddList);
+ if (CollectionUtils.isEmpty(waitAddList)) {
+ return Boolean.TRUE;
+ }
this.saveBatch(waitAddList);
// 濡傛灉鏄洿鎺ヤ笅鍙戯紝娣诲姞涓嬪彂璁板綍
if (WorkOrderStatusEnum.DISTRIBUTED.equals(waitAddList.get(0).getStatus())) {
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 63fd3e8..149d7ea 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2024
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/zgyw/uploadPath锛孡inux閰嶇疆 /home/zgyw/uploadPath锛�
- profile: E:/ycl/zgyw/uploadPath
+ profile: /home/zgyw/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
@@ -36,7 +36,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
username: root
password: ycl@202466
type: com.alibaba.druid.pool.DruidDataSource
@@ -82,6 +82,8 @@
password: ycl2018
# 鏁版嵁搴撶储寮�
database: 0
+ # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
+ # password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
@@ -109,33 +111,29 @@
# 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
subscriptionConnectionPoolSize: 50
+
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
- pathMapping: /dev-api
+ pathMapping: /prod-api
# MongoDB閰嶇疆
spring:
data:
mongodb:
- host: 42.193.1.25
- database: zgyw
- port: 27017
- username: admin
- password: ycl@202466
-
+ uri: mongodb://root1:yunwei%402024@192.168.3.88:27017/zgyw?authSource=admin
# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
request:
retry: 4 # 鏈�澶ч噸璇曟鏁�
- youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
- haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
+ youYunDomain: http://51.92.65.56 # 浼樹簯鍦板潃
+ haiKangDomain: 51.92.65.48 # 娴峰悍鍦板潃
youYun:
- tenantId: 11
- email: 11
- passwd: 11
- apikey: 11
- accesskey: 11
+ tenantId: e10adc3949ba59abbe56e057f20f88dd
+ email: yunwei
+ passwd: Yesc@123
+ apikey: 72fcfd6825304f7fa0453134de620f3a
+ accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 94730ac..81766c5 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -36,9 +36,9 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://51.92.65.72:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
username: root
- password: ycl@202466
+ password: zgyw@202488
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -76,10 +76,10 @@
spring.data:
redis:
# 鍦板潃
- host: 42.193.1.25
+ host: 127.0.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
- password: ycl2018
+ password:
# 鏁版嵁搴撶储寮�
database: 1
# 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
@@ -115,7 +115,7 @@
# Swagger閰嶇疆
swagger:
# 鏄惁寮�鍚痵wagger
- enabled: true
+ enabled: false
# 璇锋眰鍓嶇紑
pathMapping: /prod-api
@@ -123,21 +123,17 @@
spring:
data:
mongodb:
- host: 42.193.1.25
- database: zgyw
- port: 27017
- username: admin
- password: ycl@202466
+ uri: mongodb://root:yunwei%402024@127.0.0.1:27017/zgyw?authSource=admin
# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
request:
retry: 4 # 鏈�澶ч噸璇曟鏁�
- youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
- haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
+ youYunDomain: http://51.92.65.56 # 浼樹簯鍦板潃
+ haiKangDomain: 51.92.65.48 # 娴峰悍鍦板潃
youYun:
- tenantId: e10adc3949ba59abbe56e057f2gg88dd
- email: 11
- passwd: 11
- apikey: 11
-
+ tenantId: e10adc3949ba59abbe56e057f20f88dd
+ email: yunwei
+ passwd: Yesc@123
+ apikey: 72fcfd6825304f7fa0453134de620f3a
+ accesskey: fc9503a521544e76a8e69b912a2f177bc6362b19
--
Gitblit v1.8.0