lidongyang/tvs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2025-10-31 11:27:29 +08:00
parent d1edc5abd1 43f02afd65
commit 578ea098da
7 changed files with 10 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/thread/ApprovePostProcessor.java
View File

@@ -145,16 +145,14 @@ public class ApprovePostProcessor implements Callable<String> {
default -> {
}
}
if (status == 3 || status == 4) {
if (status == 3) {
//清理该评审相关的通知
// 1：项目指派通知 2：学科指派通知 3：loadcase指派通知 4：评审指派通知 5：评审完成通知 6：评审撤销通知 7：评审发布通知
// 8：新建学科通知 9：删除项目通知 10：删除学科通知 11：阶段更新通知 12：删除学科负责人通知
systemMapper.delSystemNoticeByTargetId(4, approveId);
systemMapper.delSystemNoticeByTargetId(5, approveId);
systemMapper.delSystemNoticeByTargetId(6, approveId);
systemMapper.delSystemNoticeByTargetId(7, approveId);
}
if (status == 3) {
//清理该评审相关的通知
// 1：项目指派通知 2：学科指派通知 3：loadcase指派通知 4：评审指派通知 5：评审完成通知 6：评审撤销通知 7：评审发布通知
// 8：新建学科通知 9：删除项目通知 10：删除学科通知 11：阶段更新通知 12：删除学科负责人通知
systemMapper.delSystemNoticeByTargetId(4, approveId);
systemMapper.delSystemNoticeByTargetId(5, approveId);
systemMapper.delSystemNoticeByTargetId(6, approveId);
systemMapper.delSystemNoticeByTargetId(7, approveId);
}
return result;
}

7
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/HttpUtil.java
View File

@@ -116,12 +116,6 @@ public class HttpUtil {
.build();
//返回连接
// return HttpClients.custom()
// .setConnectionManager(connManager)
// .setConnectionManagerShared(true)
// .setDefaultRequestConfig(defaultRequestConfig)
// .setSSLSocketFactory(sslsf)
// .build();
return HttpClients.custom()
.setConnectionManager(connManager)
.setConnectionManagerShared(true)
@@ -146,7 +140,6 @@ public class HttpUtil {
try {
HttpGet httpGet = new HttpGet(url);
//设置header
// httpGet.setHeader("Content-Type", "application/json");
if (headers.size() > 0) {
for (String key : headers.keySet()) {
httpGet.addHeader(key, headers.get(key));

2
ccag-tvs-sim/ccag-tvs-sim-biz/src/main/java/com/ccag/utils/lock/LockService.java
View File

@@ -116,7 +116,7 @@ public class LockService {
while (redisTemplate.hasKey(lock.getKey()));
} catch (InterruptedException e) {
log.error(e.getMessage());
return false;
Thread.currentThread().interrupt();
}
return false;
}