diff --git a/pom.xml b/pom.xml
index 776d30ef5..cd720efea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,9 +53,9 @@
nacos
- hswbpm
+ hswbpm
-
+
${middle.server.url}:8080
diff --git a/pqs-common/common-db/pom.xml b/pqs-common/common-db/pom.xml
index 399d07938..5d865cb69 100644
--- a/pqs-common/common-db/pom.xml
+++ b/pqs-common/common-db/pom.xml
@@ -74,6 +74,12 @@
mybatis-plus-boot-starter
+
+ com.baomidou
+ dynamic-datasource-spring-boot-starter
+ 3.5.1
+
+
diff --git a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/BusinessDataUtil.java b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/BusinessDataUtil.java
index 2a12739c6..d0a3dd132 100644
--- a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/BusinessDataUtil.java
+++ b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/BusinessDataUtil.java
@@ -25,7 +25,7 @@ public class BusinessDataUtil {
List> unTolerateData = new ArrayList<>();
for (List list : originData) {
//是否超过上限
- if (list.get(0) <= 0.03) {
+ if (list.get(0) <= 0.003) {
int line = 230 - 30000 * list.get(0).intValue();
if (list.get(1) > line) {
unTolerateData.add(list);
diff --git a/pqs-common/common-oss/pom.xml b/pqs-common/common-oss/pom.xml
index c31b7a36f..86d8a65be 100644
--- a/pqs-common/common-oss/pom.xml
+++ b/pqs-common/common-oss/pom.xml
@@ -63,6 +63,13 @@
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ 3.18.0
+ false
+
\ No newline at end of file
diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java
index 9b305da0e..0d16c1eec 100644
--- a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java
+++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/RedisKeyEnum.java
@@ -45,7 +45,22 @@ public enum RedisKeyEnum {
/**
* 云前置心跳
*/
- CLD_HEART_BEAT_KEY("CLD_HEART_BEAT:", 180L);
+ CLD_HEART_BEAT_KEY("CLD_HEART_BEAT:", 180L),
+
+ /**
+ * 用户日志队列
+ */
+ USER_LOG_QUEUE("USER_LOG_QUEUE", -1L),
+
+ /**
+ * 用户日志邮件推送队列
+ */
+ USER_LOG_EMAIL_QUEUE("USER_LOG_EMAIL_QUEUE", -1L),
+
+ /**
+ * 终端日志
+ */
+ DEVICE_LOG_QUEUE("DEVICE_LOG_QUEUE", -1L);
private final String key;
diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/utils/RedisMessageQueueUtil.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/utils/RedisMessageQueueUtil.java
new file mode 100644
index 000000000..5ec6f4454
--- /dev/null
+++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/utils/RedisMessageQueueUtil.java
@@ -0,0 +1,66 @@
+package com.njcn.redis.utils;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Redis 消息队列工具类
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RedisMessageQueueUtil {
+
+ private final RedisTemplate redisTemplate;
+
+ /**
+ * 推送消息到队列（左推）
+ *
+ * @param queueKey 队列Key
+ * @param message 消息内容（JSON字符串）
+ */
+ public void pushMessage(String queueKey, String message) {
+ try {
+ redisTemplate.opsForList().leftPush(queueKey, message);
+ } catch (Exception e) {
+ log.error("推送消息到队列失败，queueKey={}", queueKey, e);
+ throw e;
+ }
+ }
+
+ /**
+ * 阻塞式弹出消息（右弹）
+ *
+ * @param queueKey 队列Key
+ * @param timeout 超时时间（秒）
+ * @return 消息内容，超时返回null
+ */
+ public String popMessage(String queueKey, long timeout) {
+ try {
+ Object result = redisTemplate.opsForList().rightPop(queueKey, timeout, TimeUnit.SECONDS);
+ return result != null ? result.toString() : null;
+ } catch (Exception e) {
+ log.error("弹出消息失败，queueKey={}", queueKey, e);
+ return null;
+ }
+ }
+
+ /**
+ * 获取队列长度（用于监控）
+ *
+ * @param queueKey 队列Key
+ * @return 队列长度
+ */
+ public Long getQueueSize(String queueKey) {
+ try {
+ return redisTemplate.opsForList().size(queueKey);
+ } catch (Exception e) {
+ log.error("获取队列长度失败，queueKey={}", queueKey, e);
+ return 0L;
+ }
+ }
+}
\ No newline at end of file
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/config/FeignConfig.java b/pqs-common/common-web/src/main/java/com/njcn/web/config/FeignConfig.java
index d8fdfd33e..ec519054b 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/config/FeignConfig.java
+++ b/pqs-common/common-web/src/main/java/com/njcn/web/config/FeignConfig.java
@@ -47,6 +47,7 @@ public class FeignConfig {
@Bean
public Decoder feignDecoder() {
return (response, type) -> {
+
String bodyStr = Util.toString(response.body().asReader(Util.UTF_8));
//对结果进行转换
HttpResult