From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] (1)升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败; (2)升级状态向Remote模块通知时,当升级任务结束后,仍要向remote模块通知可配置的次数;
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUserRole.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 4b94f1e..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,10 +1,18 @@
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
@@ -14,8 +22,12 @@
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