From 98f2e843d13efe8e48a1bc210d82f3f85528f561 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 21 十月 2025 11:50:43 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 24 ++++++-----
server/startsh/启动脚本和日志处理脚本说明.txt | 8 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 13 +++---
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/startsh/admin_start.sh | 6 +++
server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java | 20 +++++++++-
server/startsh/service_start.sh | 12 ++++++
8 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/server/startsh/admin_start.sh b/server/startsh/admin_start.sh
index ae7e192..6810e77 100644
--- a/server/startsh/admin_start.sh
+++ b/server/startsh/admin_start.sh
@@ -13,3 +13,9 @@
nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
+
+#tail -f /usr/local/jars/logs/visitsTimer/info.2025-10-20.1.log
+#tail -f /usr/local/jars/logs/visitsAdmin/info.2025-10-20.1.log
+#tail -f /usr/local/jars/logs/system_gateway/info.2025-10-20.1.log
+#tail -f /usr/local/jars/logs/systemTimer/info.2025-10-20.1.log
+#tail -f /usr/local/jars/logs/meetingAdmin/info.2025-10-20.1.log
diff --git a/server/startsh/service_start.sh b/server/startsh/service_start.sh
new file mode 100644
index 0000000..31069aa
--- /dev/null
+++ b/server/startsh/service_start.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+killall java
+redis-server &
+/usr/local/nginx/sbin/nginx
+/usr/local/nacos/nacos/bin/startup.sh -m standalone
+
+nohup java -jar /usr/local/jars/system_gateway.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/admin_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/system_timer.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/admin_interface.jar > /dev/null 2>&1 &
+nohup java -jar /usr/local/jars/meeting_admin.jar > /dev/null 2>&1 &
diff --git "a/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt" "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
index c8720f2..92ef7a7 100644
--- "a/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
+++ "b/server/startsh/\345\220\257\345\212\250\350\204\232\346\234\254\345\222\214\346\227\245\345\277\227\345\244\204\347\220\206\350\204\232\346\234\254\350\257\264\346\230\216.txt"
@@ -11,3 +11,11 @@
#鎸塃sc閿悗鍐嶈緭鍏�:wq锛�,鍥炶溅淇濆瓨
#鏌ョ湅鏄惁鍒涘缓鎴愬姛
crontab -l
+
+
+
+
+vim /etc/systemd/system/zhyqVisits.service
+
+sudo systemctl start zhyqVisits.service
+sudo systemctl enable zhyqVisits.service
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 33f5d9e..c1cd8a1 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -21,6 +21,7 @@
public static final String HEADER_USER_TOKEN = "dm_user_token";
public static final String REDIS_TOKEN_KEY = "token_";
public static final String REDIS_HK_TOKEN_KEY = "hk_token_";
+ public static boolean IS_AUTOCALL_WORKING = false;
public static final String HK_TOKEN_VALIDITY = "HK_TOKEN_VALIDITY";
public static final String[] ALL_SPELL_LIST_FIRST = new String[]{"A", "B", "C", "D", "E", "F", "G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
public static final int ZERO = 0 ;
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
index 86461d0..df51e12 100644
--- a/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/PlatformJobController.java
@@ -1,6 +1,7 @@
package com.doumee.api;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.utils.Constants;
import com.doumee.service.business.third.WmsService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.PlatformJobService;
@@ -75,9 +76,24 @@
@ApiOperation("鏈堝彴鑷姩鍙彿")
@PostMapping("/autoPlatformCallCar")
public ApiResponse autoPlatformCallCar() {
- platformJobService.autoPlatformCallCar(wmsService);
- platformJobService.autoCallInParkCar(wmsService);
+ log.error("========鏈堝彴鑷姩鍙彿============寮�濮�"+System.currentTimeMillis()+"");
+ if(Constants.IS_AUTOCALL_WORKING){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛屼笂涓�杞綔涓氭湭缁撴潫"+System.currentTimeMillis());
+ return ApiResponse.success("鏈堝彴鑷姩鍙彿,涓婁竴杞綔涓氭湭缁撴潫");
+ }
+ try {
+ Constants.IS_AUTOCALL_WORKING =true;
+ platformJobService.autoPlatformCallCar(wmsService);
+ platformJobService.autoCallInParkCar(wmsService);
+ log.error("========鏈堝彴鑷姩鍙彿============瀹屾垚"+System.currentTimeMillis()+"");
+ }catch (Exception e){
+ log.error("========鏈堝彴鑷姩鍙彿============寮傚父"+System.currentTimeMillis()+e.getMessage());
+ }finally {
+ Constants.IS_AUTOCALL_WORKING =false;
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫"+System.currentTimeMillis());
+ }
return ApiResponse.success("鏈堝彴鑷姩鍙彿");
+
}
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 9dc10e9..2df12af 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index d60b9ac..5823fae 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -696,10 +696,10 @@
savePlatformLog(Constants.PlatformJobLogType.SIGN.getKey(),oldPlatformJob,platformJob,
Constants.PlatformJobLogType.SIGN.getInfo());
//绛惧埌寰俊閫氱煡 2025骞�3鏈�26鏃�14:25:00
- logger.info("绛惧埌寰俊閫氱煡=========================>寮�濮�====绛惧埌绫诲瀷=>"+signInDTO.getSignType()+"===>浜哄憳涓婚敭=>"+platformGroup.getSignInNoticeUsers());
+ log.info("绛惧埌寰俊閫氱煡=========================>寮�濮�====绛惧埌绫诲瀷=>"+signInDTO.getSignType()+"===>浜哄憳涓婚敭=>"+platformGroup.getSignInNoticeUsers());
if(!Constants.equalsInteger(signInDTO.getSignType(),Constants.TWO)&&
StringUtils.isNotBlank(platformGroup.getSignInNoticeUsers())){
- logger.info("绛惧埌寰俊閫氱煡=========================>杩涘叆");
+ log.info("绛惧埌寰俊閫氱煡=========================>杩涘叆");
List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO).isNotNull(SystemUser::getOpenid)
.in(SystemUser::getMemberId,Arrays.asList(platformGroup.getSignInNoticeUsers().split(",")))
@@ -712,7 +712,7 @@
);
}
}
- logger.info("绛惧埌寰俊閫氱煡=========================>缁撴潫");
+ log.info("绛惧埌寰俊閫氱煡=========================>缁撴潫");
}
@@ -1036,7 +1036,6 @@
- private Logger logger = LoggerFactory.getLogger(PlatformJobServiceImpl.class);
@Override
public void sendInPark(PlatformJob platformJob){
@@ -1710,7 +1709,7 @@
jobIds.add(job.getJobId());
}
}catch (Exception e){
- logger.error("=============鏇存柊鐢靛瓙閿佺姸鎬佷俊鎭紓甯革細"+e.getMessage());
+ log.error("=============鏇存柊鐢靛瓙閿佺姸鎬佷俊鎭紓甯革細"+e.getMessage());
}
}
}
@@ -2576,9 +2575,6 @@
return platformJob;
}
-
-
-
@Override
public void autoPlatformCallCar(WmsService wmsService){
//鏌ヨ褰撳墠寮�鍚殑鏈堝彴鏁版嵁
@@ -2586,6 +2582,7 @@
.eq(PlatformGroup::getIsdeleted,Constants.ZERO).eq(PlatformGroup::getAutoCall,Constants.ONE)
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allPlatformGroup)){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤鑷姩鍙彿鏈堝彴缁�");
return;
}
//杩囨护褰撳墠鏃堕棿娈典笉鍦ㄦ椂闂村唴鐨勬湀鍙扮粍 AUTO_CALL_END_TIME AUTO_CALL_START_TIME
@@ -2596,6 +2593,7 @@
&& Integer.valueOf(i.getAutoCallEndTime().replaceAll(":","")) > nowHm
).collect(Collectors.toList());
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(autoCallGroup)){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤宸ヤ綔鏃堕棿鍐� 鑷姩鍙彿鏈堝彴缁�");
return;
}
//鏌ヨ鎵�鏈夋湀鍙�
@@ -2607,12 +2605,14 @@
.in(Platform::getGroupId,autoCallGroup.stream().map(i->i.getId()).collect(Collectors.toList()))
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(platformList)){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤鑷姩鍙彿鏈堝彴");
return;
}
//寰幆鎵�鏈夎嚜鍔ㄥ彨鍙锋湀鍙�
for (PlatformGroup platformGroup:autoCallGroup) {
List<Platform> platforms = platformList.stream().filter(i->Constants.equalsInteger(i.getGroupId(),platformGroup.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(platforms)){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤鑷姩鍙彿鏈堝彴-"+platformGroup.getName());
continue;
}
Boolean isDefaul = false;
@@ -2630,7 +2630,6 @@
}
}
for (Platform platform:platforms) {
-
//鏈堝彴 鍙彿鍏ュ洯鏁伴噺
Integer workingNum = platform.getWorkingNum();
//鏌ヨ褰撳墠鏈堝彴鏄惁瀛樺湪鏈堝彴鍙彿鏁版嵁 濡傛灉澶т簬绛変簬鍙彨鍙锋暟閲� 鍒欒烦杩�
@@ -2639,6 +2638,7 @@
.eq(PlatformJob::getPlatformId,platform.getId())
.eq(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())).intValue();
if(workNum>=workingNum){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氳秴杩囪嚜鍔ㄥ彨鍙蜂綔涓氶檺鍒�-"+platform.getName());
continue;
};
@@ -2659,11 +2659,13 @@
.orderByDesc(PlatformJob::getStatus,PlatformJob::getUrgeTime)
.orderByAsc(PlatformJob::getSignDate));
if(CollectionUtils.isEmpty(platformJobList)){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤婊¤冻鏉′欢鐨勪綔涓�1-"+platform.getName());
continue;
}
for (int i = 0; i < workingNum - workNum ; i++) {
PlatformJob platformJob = this.getAutoCallJob(platformJobList,platform,isDefaul,platformGroup);
if(Objects.isNull(platformJob)){
+ log.error("========鏈堝彴鑷姩鍙彿============缁撴潫锛氭棤婊¤冻鏉′欢鐨勪綔涓�2-"+platform.getName());
continue;
}
JobOperateDTO jobOperateDTO = new JobOperateDTO();
@@ -2681,7 +2683,7 @@
wmsService.orderPlatformBind(callPlatformJob);
}
}catch (Exception e){
- logger.error("鏈堝彴鑷姩鍙彿鏉冮檺涓嬪彂澶辫触锛歿}"+JSONObject.toJSONString(platform));
+ log.error("鏈堝彴鑷姩鍙彿鏉冮檺涓嬪彂澶辫触锛歿}"+JSONObject.toJSONString(platform));
}
}
}
@@ -2779,7 +2781,7 @@
wmsService.orderPlatformBind(callPlatformJob);
}
}catch (Exception e){
- logger.error("鑷姩鍙彿鍏ュ洯鏉冮檺涓嬪彂澶辫触锛歿}"+JSONObject.toJSONString(platform));
+ log.error("鑷姩鍙彿鍏ュ洯鏉冮檺涓嬪彂澶辫触锛歿}"+JSONObject.toJSONString(platform));
}
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 377c814..31254d5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -144,14 +144,15 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鏈堝彴缁勪俊鎭笉姝ｇ‘锛�");
}
//濡傛灉鏈堝彴鍒嗙粍鍙戠敓鍙樺寲
- Long count = platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda()
+ Long count = platformJobJoinMapper.selectCount( new QueryWrapper<PlatformJob>().lambda()
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getPlatformId,model.getId())
- .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.WART_SIGN_IN.getKey()
- ,Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()
- ,Constants.PlatformJobStatus.DONE.getKey()
- ,Constants.PlatformJobStatus.LEAVED.getKey()
- ,Constants.PlatformJobStatus.CANCEL.getKey()
+ .in(PlatformJob::getStatus,Constants.PlatformJobStatus.IN_WAIT.getKey()
+ ,Constants.PlatformJobStatus.CALLED.getKey()
+ ,Constants.PlatformJobStatus.WORKING.getKey()
+ ,Constants.PlatformJobStatus.TRANSFERING.getKey()
+ ,Constants.PlatformJobStatus.EXCEPTION.getKey()
+ ,Constants.PlatformJobStatus.OVER_NUMBER.getKey()
));
if(count!=null && count>0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠鏈堝彴鏈夋鍦ㄤ綔涓氱殑浠诲姟锛屼笉鑳借繘琛屾湀鍙扮粍鍒囨崲鎿嶄綔锛�");
--
Gitblit v1.9.3