From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 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
new file mode 100644
index 0000000..1f7c680
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/multiDataSource/DataSourceSingleAspect.java
@@ -0,0 +1,57 @@
+package com.dy.common.multiDataSource;
+
+
+import com.dy.common.contant.Constant;
+import com.dy.common.springUtil.SpringContextUtil;
+import com.mysql.cj.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+@Slf4j
+@Aspect
+@Order(Constant.AspectOrderDataSource)
+@Component
+public class DataSourceSingleAspect {
+
+ @Pointcut("@annotation(com.dy.common.multiDataSource.DataSourceSingle)")
+ public void dataSourceSinglePointCut() {
+ }
+
+ @Around("dataSourceSinglePointCut()")
+ public Object around(ProceedingJoinPoint point) throws Throwable {
+ MethodSignature signature = (MethodSignature) point.getSignature();
+ Method method = signature.getMethod();
+ DataSourceSingle dataSource = method.getAnnotation(DataSourceSingle.class);
+
+ if (Objects.nonNull(dataSource) && !StringUtils.isNullOrEmpty(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);
+ DataSourceContext.set(datasourceName);
+ }else{
+ log.error("鏁版嵁婧愭湭鎸囧畾");
+ }
+ }
+ try {
+ //log.info("鏁版嵁搴撴搷浣滃紑濮�" + dataSource.value());
+ return point.proceed();
+ } finally {
+ // 閿�姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚�
+ //log.info("鏁版嵁婧愭搷浣滃畬姣�" + dataSource.value());
+ DataSourceContext.remove();
+ }
+ }
+}
--
Gitblit v1.8.0