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-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
index bcceb8d..f8f9dbc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java
@@ -1,20 +1,33 @@
package com.dy.pipIrrGlobal.pojoBa;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
import lombok.*;
-@TableName(autoResultMap = true)
+/**
+ * 鐢ㄦ埛涓庤鑹插叧绯诲疄浣�
+ */
+@TableName(value="ba_user_role", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class BaUserRole {
+public class BaUserRole implements BaseEntity {
public static final long serialVersionUID = 202311061942001L;
- private Long userId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "userId")
+ public Long userId;
- private Long roleId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "roleId")
+ public Long roleId;
}
\ No newline at end of file
--
Gitblit v1.8.0