From 9d9c6cf2159ac50219a367e2c0581b86c1602fa3 Mon Sep 17 00:00:00 2001 From: dazer007 Date: Wed, 12 Mar 2025 12:53:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20killSession=E6=94=AF=E6=8C=81pacs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/neuhis/quartz/task/HisTask.java | 6 ++++-- ruoyi-admin/src/main/resources/application-xyzxhis.yml | 7 +++++++ ruoyi-admin/src/main/resources/bjca.properties | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/neuhis/quartz/task/HisTask.java b/ruoyi-admin/src/main/java/com/neuhis/quartz/task/HisTask.java index 45f3e683a..ece7b22b5 100644 --- a/ruoyi-admin/src/main/java/com/neuhis/quartz/task/HisTask.java +++ b/ruoyi-admin/src/main/java/com/neuhis/quartz/task/HisTask.java @@ -73,15 +73,17 @@ public class HisTask { ///List deadLocks = oracleSysService.getDeadLockSessionV1(); //deadLocks.forEach(deadLock -> HisTask.this.oracleSysService.killSession(deadLock.getSessionStr())); + log.info("his oracle 死锁查询"); List sessionV2Rac = oracleSysService.getDeadLockSessionV2Rac(); sessionV2Rac.forEach(deadLock -> HisTask.this.oracleSysService.killSession(deadLock.getSessionStr())); - log.info("杀lis oracle死锁结束，被杀进程数量：" + sessionV2Rac.size() + "," + DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss")); + log.info("杀his oracle死锁结束，被杀进程数量：" + sessionV2Rac.size() + "," + DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss")); + log.info("winlis oracle 死锁查询"); sessionV2Rac = oracleSysWinlisService.getDeadLockSessionV2Rac(); sessionV2Rac.forEach(deadLock -> HisTask.this.oracleSysWinlisService.killSession(deadLock.getSessionStr())); log.info("杀winlis oracle死锁结束，被杀进程数量：" + sessionV2Rac.size() + "," + DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss")); - + log.info("pacs oracle 死锁查询"); sessionV2Rac = oracleSysPacsService.getDeadLockSessionV2Rac(); sessionV2Rac.forEach(deadLock -> HisTask.this.oracleSysPacsService.killSession(deadLock.getSessionStr())); log.info("杀pacs oracle死锁结束，被杀进程数量：" + sessionV2Rac.size() + "," + DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss")); diff --git a/ruoyi-admin/src/main/resources/application-xyzxhis.yml b/ruoyi-admin/src/main/resources/application-xyzxhis.yml index 87661dab3..e805ca28e 100644 --- a/ruoyi-admin/src/main/resources/application-xyzxhis.yml +++ b/ruoyi-admin/src/main/resources/application-xyzxhis.yml @@ -65,6 +65,13 @@ spring: url: jdbc:oracle:thin:@10.10.10.31:1521/dzbl username: winlis password: lis0928 + pacs: #参考类：DruidConfig、DataSourceType + # 从数据源开关/默认关闭 + enabled: true + driverClassName: oracle.jdbc.OracleDriver + url: jdbc:oracle:thin:@10.10.13.10:1521/pacs + username: pacs50 + password: pacs600718 # 初始连接数 initialSize: 5 # 最小连接池数量 diff --git a/ruoyi-admin/src/main/resources/bjca.properties b/ruoyi-admin/src/main/resources/bjca.properties index d26fcddf1..0d70f2edd 100644 --- a/ruoyi-admin/src/main/resources/bjca.properties +++ b/ruoyi-admin/src/main/resources/bjca.properties @@ -2,6 +2,7 @@ # CA\u670D\u52A1\u5730\u5740 nhit.dc.ca.bjxt01.server-base:http://192.168.216.112:10201/coss #nhit.dc.ca.bjxt01.server-base:http://61.134.26.120:10201/coss #\u5916\u7F51\u5730\u5740 +#nhit.dc.ca.bjxt01.server-base:https://newcoss-dev.isignet.cn:10201/coss #\u5916\u7F51\u6D4B\u8BD5\u5730\u5740 #\u5317\u4EACCA\u534F\u540C\u5E73\u53F0\u7684USER_ID, \u5B59\u9759 \u68C0\u9A8C\u79D1 000616 #\u5237\u6570\u636E\uFF0C\u4F7F\u7528\u56FA\u5B9A\u4E00\u4E2A\u533B\u5E08\u7684user_id nhit.dc.ca.bjxt01.user_id:2122e89265cc291a00f8d20800bfd24c0f7f72db9225cb69a208dc7183ac2849