From 7f3cae29516a35e85e4b6fc02ec655882d4c2538 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 08 五月 2025 11:55:24 +0800 Subject: [PATCH] 1、测控一体阀协议功能码50补充实现; 2、RTU模拟器模拟实现50、91、92功能码上报; 3、remote模块:完善透传命令实现,完善接收通信中间件返回命令结果实现。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java index 860bfcc..1f7c680 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java @@ -33,24 +33,24 @@ DataSourceSingle dataSource = method.getAnnotation(DataSourceSingle.class); if (Objects.nonNull(dataSource) && !StringUtils.isNullOrEmpty(dataSource.value())) { - log.info("鏁版嵁婧愭寚瀹氫负" + dataSource.value()); + //log.info("鏁版嵁婧愭寚瀹氫负" + dataSource.value()); //寮哄埗杞垚鏂规硶涓婇厤缃殑鏁版嵁婧愶紝鏇挎崲鎺塂ataSourceContext涓繚瀛樼殑鏁版嵁婧� DataSourceContext.set(dataSource.value()); }else{ String datasourceName = SpringContextUtil.getApplicationContext().getEnvironment().getProperty("spring.datasource.names") ; if(!StringUtils.isNullOrEmpty(datasourceName)){ - log.info("鏍规嵁閰嶇疆鏁版嵁婧愪负" + datasourceName); + //log.info("鏍规嵁閰嶇疆鏁版嵁婧愪负" + datasourceName); DataSourceContext.set(datasourceName); }else{ log.error("鏁版嵁婧愭湭鎸囧畾"); } } try { - log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value()); + //log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value()); return point.proceed(); } finally { // 閿�姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚� - log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value()); + //log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value()); DataSourceContext.remove(); } } -- Gitblit v1.8.0